diff --git a/app/views/contests/edit.html.erb b/app/views/contests/edit.html.erb
deleted file mode 100644
--- a/app/views/contests/edit.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<h1>Editing contest</h1>
-
-<%= form_for(@contest) do |f| %>
-  <%= f.error_messages %>
-
-  <table>
-    <tr>
-      <td><%= f.label :name %></td>
-      <td><%= f.text_field :name %></td>
-    </tr>
-    <tr>
-      <td><%= f.label :title %></td>
-      <td><%= f.text_field :title %></td>
-    </tr>
-    <tr>
-      <td></td>
-      <td>
-	<%= f.check_box :enabled %>
-	<%= f.label :enabled %>
-      </td>
-    </tr>
-  </table>
-  <p>
-    <%= f.submit 'Update' %>
-  </p>
-<% end %>
-
-<%= link_to 'Show', @contest %> |
-<%= link_to 'Back', contests_path %>
diff --git a/app/views/contests/edit.html.haml b/app/views/contests/edit.html.haml
new file mode 100644
--- /dev/null
+++ b/app/views/contests/edit.html.haml
@@ -0,0 +1,20 @@
+%h1 Editing contest
+= form_for(@contest) do |f|
+  = f.error_messages
+  %table
+    %tr
+      %td= f.label :name
+      %td= f.text_field :name
+    %tr
+      %td= f.label :title
+      %td= f.text_field :title
+    %tr
+      %td
+      %td
+        = f.check_box :enabled
+        = f.label :enabled
+  %p
+    = f.submit 'Update'
+= link_to 'Show', @contest
+|
+= link_to 'Back', contests_path
diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb
deleted file mode 100644
--- a/app/views/contests/index.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<h1>Listing contests</h1>
-
-<div class="infobox">
-  <b>Go back to:</b> [<%= link_to 'contest management', :controller => 'contest_management', :action => 'index' %>]
-</div>
-
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Title</th>
-    <th>Enabled</th> 
-  </tr>
-
-<% @contests.each do |contest| %>
-  <% @contest = contest %>
-  <tr>
-    <td><%= in_place_editor_field :contest, :name, {}, :rows => 1 %></td>
-    <td><%= in_place_editor_field :contest, :title, {}, :rows => 1 %></td>
-    <td><%= in_place_editor_field :contest, :enabled, {}, :rows => 1 %></td>
-    <td><%= link_to 'Show', contest %></td>
-    <td><%= link_to 'Edit', edit_contest_path(contest) %></td>
-    <td><%= link_to 'Destroy', contest, :confirm => 'Are you sure?', :method => :delete %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New contest', new_contest_path %>
diff --git a/app/views/contests/index.html.haml b/app/views/contests/index.html.haml
new file mode 100644
--- /dev/null
+++ b/app/views/contests/index.html.haml
@@ -0,0 +1,27 @@
+%h1 Listing contests
+.infobox
+  %b Go back to:
+  [#{link_to 'contest management', :controller => 'contest_management', :action => 'index'}]
+%p= link_to 'New contest', new_contest_path, class: 'btn btn-success'
+%table.table.table-striped
+  %tr
+    %th Name
+    %th Title
+    %th Enabled
+    %th
+    %th
+    %th
+
+  - @contests.each do |contest|
+    - @contest = contest
+    %tr
+      -#%td= in_place_editor_field :contest, :name, {}, :rows => 1
+      -#%td= in_place_editor_field :contest, :title, {}, :rows => 1
+      -#%td= in_place_editor_field :contest, :enabled, {}, :rows => 1
+      %td= best_in_place @contest, :name
+      %td= best_in_place @contest, :title
+      %td= best_in_place @contest, :enabled
+      %td= link_to 'Show', contest
+      %td= link_to 'Edit', edit_contest_path(contest)
+      %td= link_to 'Destroy', contest, :confirm => 'Are you sure?', :method => :delete
+%br/
diff --git a/app/views/contests/new.html.erb b/app/views/contests/new.html.erb
deleted file mode 100644
--- a/app/views/contests/new.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<h1>New contest</h1>
-
-<%= form_for(@contest) do |f| %>
-  <%= f.error_messages %>
-
-  <p>
-    <%= f.label :name %><br />
-    <%= f.text_field :name %>
-  </p>
-  <p>
-    <%= f.label :title %><br />
-    <%= f.text_field :title %>
-  </p>
-  <p>
-    <%= f.label :enabled %><br />
-    <%= f.check_box :enabled %>
-  </p>
-  <p>
-    <%= f.submit 'Create' %>
-  </p>
-<% end %>
-
-<%= link_to 'Back', contests_path %>
diff --git a/app/views/contests/new.html.haml b/app/views/contests/new.html.haml
new file mode 100644
--- /dev/null
+++ b/app/views/contests/new.html.haml
@@ -0,0 +1,18 @@
+%h1 New contest
+= form_for(@contest) do |f|
+  = f.error_messages
+  %p
+    = f.label :name
+    %br/
+    = f.text_field :name
+  %p
+    = f.label :title
+    %br/
+    = f.text_field :title
+  %p
+    = f.label :enabled
+    %br/
+    = f.check_box :enabled
+  %p
+    = f.submit 'Create'
+= link_to 'Back', contests_path
diff --git a/app/views/contests/show.html.erb b/app/views/contests/show.html.erb
deleted file mode 100644
--- a/app/views/contests/show.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<h1>Contest: <%=h @contest.title %></h1>
-
-<div class="infobox">
-  <b>Go back to:</b> [<%= link_to 'contest management', :controller => 'contest_management', :action => 'index' %>]
-</div>
-
-<p>
-  <b>Enabled:</b>
-  <%=h @contest.enabled %>
-</p>
-
-
-<%= link_to 'Edit', edit_contest_path(@contest) %> |
-<%= link_to 'Back', contests_path %>
diff --git a/app/views/contests/show.html.haml b/app/views/contests/show.html.haml
new file mode 100644
--- /dev/null
+++ b/app/views/contests/show.html.haml
@@ -0,0 +1,11 @@
+%h1
+  Contest: #{h @contest.title}
+.infobox
+  %b Go back to:
+  [#{link_to 'contest management', :controller => 'contest_management', :action => 'index'}]
+%p
+  %b Enabled:
+  = h @contest.enabled
+= link_to 'Edit', edit_contest_path(@contest)
+|
+= link_to 'Back', contests_path