diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb
index c4d2f30..bd68e8c 100644
--- a/app/views/contact_us/contacts/new.html.erb
+++ b/app/views/contact_us/contacts/new.html.erb
@@ -15,57 +15,45 @@
       <%= form_for @contact, url: contacts_path, html: {class: "roadmap-form"} do |f| %>
         <fieldset class="side-by-side">
           <% if ContactUs.require_name %>
-            <div>
-              <%= f.label :name, (_('Name') + content_tag(:abbr, "*", class: "required")).html_safe %>
-              <% if user_signed_in? then %>
-                <%= f.text_field :name, value: current_user.name(false) %>
-              <% else %>
-                <%= f.text_field :name %>
-              <% end %>
-              <% if f.object.errors[:name].present? %>
-                <p class="inline-error"><%= f.object.errors[:name].join(_(" and ")) %></p>
-              <% end %>
+            <div class="form-input">
+              <label for="contact_us_contact_name"><%= _('Name') %>*</label>
+              <input type="text" id="contact_us_contact_name" name="contact_us[contact_name]" 
+                     class="left-indent required" <%= current_user.nil? ? '' : "value=\"#{current_user.name}\" disabled=\"true\"" %> />
             </div>
           <% end %>
           
-          <div>
-            <%= f.label :email, (_('Email') + content_tag(:abbr, "*", class: "required")).html_safe %>
-            <% if user_signed_in? then %>
-              <%= f.email_field :email, value: current_user.email %>
-            <% else %>
-              <%= f.email_field :email %>
-            <% end %>
-            <% if f.object.errors[:email].present? %>
-              <p class="inline-error"><%= f.object.errors[:email].join(_(" and ")) %></p>
-            <% end %>
+          <div class="form-input">
+            <label for="contact_us_contact_email"><%= _('Email') %>*</label>
+            <input type="email" id="contact_us_contact_email" name="contact_us[contact_email]" 
+                   class="left-indent required" <%= current_user.nil? ? '' : 
+                                                    "value=\"#{current_user.name}\" disabled=\"true\"" %> />
+            <span role="" id="contact_us_contact_email_error" class="error-tooltip-right left-indent"></span>
           </div>
           
           <% if ContactUs.require_subject %>
-            <div>
-              <%= f.label :subject, (_('Subject') + content_tag(:abbr, "*", class: "required")).html_safe %>
-              <%= f.text_field :subject %>
-              <% if f.object.errors[:subject].present? %>
-                <p class="inline-error"><%= f.object.errors[:subject].join(_(" and ")) %></p>
-              <% end %>
+            <div class="form-input">
+              <label for="contact_us_contact_subject align-top"><%= _('Subject') %>*</label>
+              <input type="text" id="contact_us_contact_subject" name="contact_us[contact_subject]" 
+                     class="left-indent required" />
             </div>
           <% end %>
           
-          <div>
-            <%= f.label :message, (_('Message') + content_tag(:abbr, "*", class: "required")).html_safe %>
-            <%= f.text_area :message, rows: 10, class: "input-large" %>
-            <% if f.object.errors[:message].present? %>
-              <p class="inline-error"><%= f.object.errors[:message].join(_(" and ")) %></p>
-            <% end %>
+          <div class="form-input">
+            <label for="contact_us_contact_message align-top"><%= _('Message') %>*</label>
+            <textarea id="contact_us_contact_message" name="contact_us[contact_message]" rows="10" 
+                      class="left-indent required"></textarea>
           </div>
           
           <% if !user_signed_in? then %>
-            <div>
-              <%= t('helpers.security_check') %>
-              <%= recaptcha_tags %>
+            <div class="form-input">
+              <label class="align-top"><%= _('Security check') %>*</label>
+              <div class="inline left-indent">
+                <%= recaptcha_tags %>
+              </div>
             </div>
           <% end %>
           
-          <div>
+          <div class="form-input">
             <label></label>
             <%= render partial: 'shared/accessible_submit_button',
                        locals: {id: 'create_contact_submit', 
diff --git a/lib/assets/javascripts/contacts/new_contact.js b/lib/assets/javascripts/contacts/new_contact.js
index 1b692e2..fe8350a 100644
--- a/lib/assets/javascripts/contacts/new_contact.js
+++ b/lib/assets/javascripts/contacts/new_contact.js
@@ -3,12 +3,23 @@
 };
 
 $(document).ready(function(){
+  // Run the input validations when the focus changes
+  $("#contact_us_contact_email").blur(function(){
+    toggleInputError(this, validateEmail($(this).val().trim()));
+  });
+	
   $("input[type='text'], input[type='email'], textarea").change(function(e){
     var enable = ($("#contact_us_contact_name").val().trim().length > 0 &&
-                  $("#contact_us_contact_email").val().trim().length > 0 &&
+                  validateEmail($("#contact_us_contact_email").val().trim()) != '' &&
                   $("#contact_us_contact_subject").val().trim().length > 0 &&
                   $("#contact_us_contact_message").val().trim().length > 0);
     
+		// Check the recaptcha status
+		if($("#recaptcha-anchor")){
+			if("#recaptcha-anchor".prop('aria-checked') != 'true'){
+				enable = false;
+			}
+		}
     $("#create_contact_submit").attr('aria-disabled', !enable);
   });
 });
\ No newline at end of file
diff --git a/lib/assets/stylesheets/roadmap-form.scss b/lib/assets/stylesheets/roadmap-form.scss
index 8292e40..5bcc0ce 100644
--- a/lib/assets/stylesheets/roadmap-form.scss
+++ b/lib/assets/stylesheets/roadmap-form.scss
@@ -74,6 +74,9 @@
         vertical-align: middle;
       }
 
+      label.align-top {
+        vertical-align: top;
+      }
       input.form-submit, 
       button.form-cancel {
         font-size: 10pt;
@@ -127,7 +130,7 @@
   .fixed-width-large {
     width: 550px;
   }
-   
+  
   /* Accessible Form Buttons */
   input.form-submit {
     clear: both;
diff --git a/lib/assets/stylesheets/roadmap-hacks.scss b/lib/assets/stylesheets/roadmap-hacks.scss
index dac2b63..8f6f45c 100644
--- a/lib/assets/stylesheets/roadmap-hacks.scss
+++ b/lib/assets/stylesheets/roadmap-hacks.scss
@@ -53,4 +53,7 @@
 }
 select {
   height: 30px;
+}
+textarea {
+  height: auto;
 }
\ No newline at end of file