diff --git a/client/app/custom_modules/custom_modules.html b/client/app/custom_modules/custom_modules.html
index 11ac38d..e46de8a 100644
--- a/client/app/custom_modules/custom_modules.html
+++ b/client/app/custom_modules/custom_modules.html
@@ -1,9 +1,12 @@
 <div class="row" style="margin:20px;">
   <div class="col-md-7">
+    <div class="alert alert-danger" ng-if="!customModulesCtrl.projects.length"> You must create a project first !</div>
     <div ng-show="!customModulesCtrl.showNewModuleForm.value">
-      <div style="display: inline-block"><select class="form-control" ng-model="customModulesCtrl.selectedProjectID" ng-change="customModulesCtrl.projectSelected(customModulesCtrl.selectedProjectID)" ng-options="project._id as project.name for project in customModulesCtrl.projects">
-      </select></div>
-      <button class="btn btn-default" ng-click="customModulesCtrl.newModule()"> New Module <span class="fa fa-plus"></span> </button>
+      <div style="display: inline-block">
+        <select class="form-control" ng-model="customModulesCtrl.selectedProjectID" ng-change="customModulesCtrl.projectSelected(customModulesCtrl.selectedProjectID)" ng-options="project._id as project.name for project in customModulesCtrl.projects">
+        </select>
+      </div>
+      <button ng-disabled="!customModulesCtrl.selectedProjectID" class="btn btn-default" ng-click="customModulesCtrl.newModule()"> New Module <span class="fa fa-plus"></span> </button>
       <button class="btn btn-default" ng-disabled="!customModulesCtrl.selectedModule.module.name || customModulesCtrl.loadingModuleCode" ng-click="customModulesCtrl.editModule()"> Edit Module <span class="fa fa-edit"></span> </button>
 
       <div class="table-responsive">
diff --git a/client/app/designer/designer.html b/client/app/designer/designer.html
index 7d0b36f..a6fc702 100644
--- a/client/app/designer/designer.html
+++ b/client/app/designer/designer.html
@@ -1,6 +1,7 @@
 <div style="padding:15px;">
   <div class="row">
     <div class="col-md-2">
+      Project: {{ selectedProject.ansibleVersion }}
       <select class="form-control" ng-model="selectedProjectID" ng-change="projectSelected(selectedProjectID)" ng-options="project._id as project.name for project in projects">
       </select>
       <div ng-if="selectedProject.ansibleVersion" class="hint">
@@ -8,7 +9,7 @@
       </div>
 
       <br>
-      <select class="form-control" ng-model="selectedInventoryFileName" ng-options="inventoryFile as inventoryFile for inventoryFile in inventoryFiles" ng-change="inventoryFileSelected(selectedInventoryFileName)">
+      <select ng-if="selectedProject.ansibleVersion" class="form-control" ng-model="selectedInventoryFileName" ng-options="inventoryFile as inventoryFile for inventoryFile in inventoryFiles" ng-change="inventoryFileSelected(selectedInventoryFileName)">
       </select>
       <div ng-if="selectedProject.ansibleVersion" class="hint">
         An inventory file to work with
@@ -16,7 +17,7 @@
 
 
       <br>
-      <div class="btn-group-vertical" style="width:100%"  role="group" aria-label="...">
+      <div ng-if="selectedProject.ansibleVersion" class="btn-group-vertical" style="width:100%"  role="group" aria-label="...">
         <button class="btn btn-default" ui-sref="designer.inventory">Inventory</button>
         <button class="btn btn-default" ui-sref="designer.playbook">Playbooks</button>
         <button class="btn btn-default" ui-sref="designer.roles">Roles</button>
@@ -54,11 +55,17 @@
       <div class="alert alert-danger" ng-if="err_msg">{{err_msg}}</div>
     </div>
 
-    <div class="col-md-10">
+    <div class="col-md-10" ng-if="selectedProject.ansibleVersion">
 
       <div ui-view></div>
 
     </div>
 
+    <div class="col-md-10" ng-if="!selectedProject.ansibleVersion" style="text-align: center">
+
+      <h2>You must select a project first</h2>
+
+    </div>
+
   </div>
 </div>
diff --git a/client/app/project/project.html b/client/app/project/project.html
index bc4a5d1..943304a 100644
--- a/client/app/project/project.html
+++ b/client/app/project/project.html
@@ -21,7 +21,7 @@
         <div ng-if="projectCtrl.disableAnsibleHostAddition != 'true'">
           <p class="form-group">
             <label>Ansible Host</label>
-            <input type="text" ng-model="projectCtrl.newProject.ansibleEngine.ansibleHost" class="form-control">
+            <input type="text" placeholder="localhost" ng-model="projectCtrl.newProject.ansibleEngine.ansibleHost" class="form-control">
           <div class="hint">Ansible Controller system - A linux system with Ansible Installed on it. Required if you want to execute Ansible playbooks. You could skip this and still generate playbooks but not test them.</div>
           </p>