diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index b336152..bf2fc52 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -34,6 +34,8 @@
                               default_selection: @default_org,
                               models: @orgs,
                               attribute: 'name',
+                              tooltip: _('Please select a valid research organisation from the list.'),
+                              error: _('You must select a research organisation from the list.'),
                               classes: 'input-full-width'} %>
         </div>
         
@@ -59,7 +61,8 @@
                               default_selection: nil,
                               models: @funders,
                               attribute: 'name',
-                              tooltip: _('Please select a valid funding organisation from the list'),
+                              tooltip: _('Please select a valid funding organisation from the list.'),
+                              error: _('You must select a funding organisation from the list.'),
                               classes: 'input-full-width'} %>
         </div>
         <div class="form-right-side">
diff --git a/app/views/shared/_accessible_combobox.html.erb b/app/views/shared/_accessible_combobox.html.erb
index 94d4182..c648cd8 100644
--- a/app/views/shared/_accessible_combobox.html.erb
+++ b/app/views/shared/_accessible_combobox.html.erb
@@ -1,6 +1,7 @@
 <% if !models.nil? %>
   <% json = {} %>
   <% models.map{|m| json[m[attribute]] = m.id} %>
+  <%= tip = tooltip ||= '' %>
 
   <input type="text" name="<%= name %>" id="<%= id %>" 
          class="js-combobox <%= classes %>" list="<%= id %>_list" 
@@ -23,7 +24,6 @@
          value="<%= default_selection.id unless default_selection.nil? %>" />
 
   <span role="" id="<%= id.gsub("_#{attribute}", "_error") %>" class="error-tooltip left-indent"></span>
- 
 
   <script type="text/javascript">
     var <%= id %>_crosswalk = <%= raw JSON.generate(json) %>;
diff --git a/lib/assets/javascripts/dmproadmap/forms.js b/lib/assets/javascripts/dmproadmap/forms.js
index c344e98..3ac7c46 100644
--- a/lib/assets/javascripts/dmproadmap/forms.js
+++ b/lib/assets/javascripts/dmproadmap/forms.js
@@ -40,26 +40,6 @@
 }
 
 // ---------------------------------------------------------------------------
-function toggleAutocompleteError(autocomplete, idbox, errorMessage){
-  if(autocomplete.length > 0 && idbox.length > 0){
-    var err = $(idbox).siblings("span.error-tooltip");
-    if(err.length <= 0){
-      err = $(idbox).siblings("span.error-tooltip-right");
-    }
-  
-    // If an error element is available and the error message is not empty and the field
-    // is not empty
-    if(err.length > 0 && (errorMessage === '' || $(autocomplete).val().trim().length <= 0)){
-      err.html('').attr('role', '');
-      $(autocomplete).removeClass('red-border');
-    }else{
-      err.html(errorMessage).attr('role', 'tooltip');
-      $(autocomplete).addClass('red-border');
-    }
-  }
-}
-
-// ---------------------------------------------------------------------------
 function toggleInputError(input, errorMessage, blankAsError){
   var err = $(input).siblings("span.error-tooltip");
   if(err.length <= 0){
diff --git a/lib/assets/javascripts/views/plans/new.js b/lib/assets/javascripts/views/plans/new.js
index fc4b489..69579fa 100644
--- a/lib/assets/javascripts/views/plans/new.js
+++ b/lib/assets/javascripts/views/plans/new.js
@@ -21,12 +21,12 @@
 
   // If there was no selection, highlight the box and display tooltip 
   $("#plan_funder_name").blur(function(){
-    var msg = ($("#plan_funder_id").val().trim().length <= 0 ? __('Please select a valid funding organisation from the list') : '');
-    toggleAutocompleteError($(this), $("#plan_funder_id"), msg);
+    var msg = ($("#plan_funder_id").val().trim().length <= 0 ? __('Please select a valid funding organisation from the list.') : '');
+    toggleInputError($("#plan_funder_id"), msg, true);
   });
   $("#plan_org_name").blur(function(){
-    var msg = ($("#plan_org_id").val().trim().length <= 0 ? __('Please select a valid research organisation from the list') : '');
-    toggleAutocompleteError($(this), $("#plan_org_id"), msg);
+    var msg = ($("#plan_org_id").val().trim().length <= 0 ? __('Please select a valid research organisation from the list.') : '');
+    toggleInputError($("#plan_org_id"), msg, true);
   });
 
   // Make sure the checkbox is unchecked if we're entering text
diff --git a/lib/assets/stylesheets/dmproadmap/base.scss b/lib/assets/stylesheets/dmproadmap/base.scss
index 3841fb7..0b3f654 100644
--- a/lib/assets/stylesheets/dmproadmap/base.scss
+++ b/lib/assets/stylesheets/dmproadmap/base.scss
@@ -283,7 +283,7 @@
           }
           li.active, ul li:hover {
             color: $primary-color;
-            background-color: $header-text-color;
+            background-color: $white;
           
             a, a:visited, a:active, a:link, a:hover {
               color: $primary-color;
diff --git a/lib/assets/stylesheets/dmproadmap/forms.scss b/lib/assets/stylesheets/dmproadmap/forms.scss
index e41ae5c..00cf310 100644
--- a/lib/assets/stylesheets/dmproadmap/forms.scss
+++ b/lib/assets/stylesheets/dmproadmap/forms.scss
@@ -277,7 +277,7 @@
     box-shadow: 0 0 6px $error-background;
   }
 
-  .error-tooltip, .error-tooltip-right, .submit-tooltip {
+  .error-tooltip, .error-tooltip-right, .error-tooltip-top, .submit-tooltip {
     display: none;
     width: 45%;
     background: $error-background;
@@ -293,6 +293,7 @@
     position: absolute;
     z-index: 9;
   }
+  
   .error-tooltip[role='alert']:before, .submit-tooltip[role='tooltip']:before {
     display: inline;
     position: absolute;
@@ -302,6 +303,23 @@
     color: $error-background;
     font-size: 44px;
   }
+  
+  .error-tooltip-top[role='alert'] {
+    top: -35px;
+    left: 0;
+    display: inline;
+    position: absolute;
+    z-index: 9;
+  }
+  .error-tooltip-top[role='alert']:before {
+    display: inline;
+    position: absolute;
+    margin: 0 auto;
+    top: 30px;
+    @include icon(caret-down);
+    color: $error-background;
+    font-size: 44px;
+  }
 
   .error-tooltip-right[role="alert"], .error-tooltip-right[role="tooltip"] {
     top: 0;