diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index a40b41b..31a7a8e 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -81,7 +81,7 @@
     
     <%= render partial: 'shared/accessible_submit_button',
                locals: {id: 'create_plan_submit', 
-                         val: 'Create Plan', 
+                        val: 'Create Plan', 
                         disabled_initially: true,
                         tooltip: _('You can not continue until you have filled in all of the required information.')} %>
 
diff --git a/app/views/shared/_accessible_submit_button.html.erb b/app/views/shared/_accessible_submit_button.html.erb
index b4f9b73..9e05b89 100644
--- a/app/views/shared/_accessible_submit_button.html.erb
+++ b/app/views/shared/_accessible_submit_button.html.erb
@@ -1,6 +1,6 @@
 <input id="<%= id %>" 
        type="submit" 
-       class="form-submit <%= classes %>" 
+       class="form-submit <%= classes ||= '' %>" 
        value="<%= val %>"
        aria-disabled="<%= disabled_initially %>"
        aria-describedby="<%= id %>_tip" />
diff --git a/lib/assets/stylesheets/roadmap-form.scss b/lib/assets/stylesheets/roadmap-form.scss
index a4bcbec..7264ddc 100644
--- a/lib/assets/stylesheets/roadmap-form.scss
+++ b/lib/assets/stylesheets/roadmap-form.scss
@@ -152,11 +152,12 @@
     background-color: $cancel-button-color;
     color: $reverse-text;
     padding: 4px 12px;
+    margin-top: 15px;
     font-size: 14px;
    
-    -webkit-border-radius: 10px;
-    -moz-border-radius: 10px;
-    border-radius: 10px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
   }
   
   /* Tooltip */
@@ -329,11 +330,7 @@
 #new_user.user-registration {
   #user_firstname,
   #user_surname {
-    width: 150px;
-  }
-  input[type="password"],
-  input[type="email"] {
-    width: 332px;
+    width: 182px;
   }
 }
 div#forgot-password-link {
diff --git a/test/integration/authentication_test.rb b/test/integration/authentication_test.rb
index c9d4c26..c647877 100644
--- a/test/integration/authentication_test.rb
+++ b/test/integration/authentication_test.rb
@@ -39,7 +39,7 @@
     get root_path
     
     # Make sure that the user is sent to the page that lists their plans
-    assert_select '.welcome-message h2', _('Welcome.')
+    assert_select 'h1', _('Welcome.')
   end
   
   # ----------------------------------------------------------
@@ -58,7 +58,7 @@
     
       # Make sure that the user is sent to the page that lists their plans
       assert_response :success
-      assert_select '.welcome-message h2', _('Welcome.')
+      assert_select 'h1', _('Welcome.')
     end
   end
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index ec8cda5..a366019 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -117,7 +117,7 @@
     follow_redirects
 
     assert_response :success
-    assert_select '.welcome-message h2', _('Welcome.')
+    assert_select 'h1', _('Welcome.')
   end
 
   # ----------------------------------------------------------------------