diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 19633b2..2f681fa 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -1,12 +1,10 @@
 <%= link_to @forum.group, forumgroup_path(@forum.group) %> → <%= link_to @forum %>
 <h1><%= @forum.name %></h1>
-<%= link_to "New thread", new_forumthread_path, class: "btn blue" %>
+<%= link_to "New thread", new_forum_forumthread_path(@forum), class: "btn blue" %>
 <div id="forum_threads">
   <% @threads.each do |thread| %>
-    <div class="group" id="thread-<%= thread.id %>">
-      <div class="header">
-        <%= link_to thread.title, forumthread_path(thread) %>
-      </div>
+    <div class="forum_thread" id="thread-<%= thread.id %>">
+      <%= link_to thread.title, forum_forumthread_path(@forum, thread) %>
     </div>
   <% end %>
 </div>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 6c7b120..75a0216 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,12 +24,10 @@ Site::Application.routes.draw do
   end
 
   resources :forums, path: 'forums' do
-      collection do
-        resources :forumgroups, path: 'groups'
-      end
-      member do
-        resources :forumthreads, path: 'threads'
-      end
+    resources :forumthreads, path: 'threads'
+    collection do
+      resources :forumgroups, path: 'groups'
+    end
   end
 
   match '/status' => 'status#show'