diff --git a/app/assets/stylesheets/components/_forms.scss b/app/assets/stylesheets/components/_forms.scss
index e86b20f..4c70a55 100644
--- a/app/assets/stylesheets/components/_forms.scss
+++ b/app/assets/stylesheets/components/_forms.scss
@@ -27,6 +27,7 @@ form {
     > .field_with_errors {
 
       input,
+      input[type=text],
       textarea {
         border: $input-border-width solid $flash-error;
 
diff --git a/app/assets/stylesheets/pages/_matches.scss b/app/assets/stylesheets/pages/_matches.scss
index e2ee9d2..8ce9e99 100644
--- a/app/assets/stylesheets/pages/_matches.scss
+++ b/app/assets/stylesheets/pages/_matches.scss
@@ -109,12 +109,12 @@ div#match {
       }
 
       .score-1 {
-        padding-left: $title-height/5;
+        padding-left: $title-height/6;
         left: 0;
       }
       
       .score-2 {
-        padding-right: $title-height/5;
+        padding-right: $title-height/6;
         right: 0;
       }
     }
diff --git a/app/views/teams/new.html.erb b/app/views/teams/new.html.erb
index eeee3b1..07dc6f2 100644
--- a/app/views/teams/new.html.erb
+++ b/app/views/teams/new.html.erb
@@ -1,37 +1,33 @@
-<h1>New team</h1>
+<h1>New Team</h1>
 
-<div class="wide box">
-  <%= form_for(@team) do |f| %>
-    <%= f.error_messages %>
+<%= form_for(@team, html: { class: 'square horizontal' }) do |f| %>
+  <%= render 'shared/errors', messages: @team.errors.full_messages %>
 
-    <p>
-      <%= f.label :name %><br />
-      <%= f.text_field :name %>
-    </p>
-    <p>
-      <%= f.label :irc %><br />
-      <%= f.text_field :irc %>
-    </p>
-    <p>
-      <%= f.label :web %><br />
-      <%= f.text_field :web %>
-    </p>
-    <p>
-      <%= f.label :tag %><br />
-      <%= f.text_field :tag %>
-    </p>
-    <p>
-      <%= f.label :country %><br />
-      <%= country_code_select :team, :country %>
-    </p>
-    <p>
-      <%= f.label :comment %><br />
-      <%= f.text_field :comment %>
-    </p>
-    <p>
-      <%= f.submit "Create" %>
-    </p>
-  <% end %>
-</div>
-
-<%= link_to 'Back', teams_path %>
+  <div class="fields horizontal">
+    <%= f.label :name %>
+    <%= f.text_field :name %>
+  </div>
+  <div class="fields horizontal">
+    <%= f.label :irc %>
+    <%= f.text_field :irc %>
+  </div>
+  <div class="fields horizontal">
+    <%= f.label :web %>
+    <%= f.text_field :web %>
+  </div>
+  <div class="fields horizontal">
+    <%= f.label :tag %>
+    <%= f.text_field :tag %>
+  </div>
+  <div class="fields horizontal">
+    <%= f.label :country %>
+    <%= country_code_select :team, :country %>
+  </div>
+  <div class="fields horizontal">
+    <%= f.label :comment %>
+    <%= f.text_field :comment %>
+  </div>
+  <div class="controls">
+    <%= f.submit "Create" %>
+  </div>
+<% end %>