diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index fdb71892b..f524048b4 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -18,7 +18,9 @@ class ForumsController < ApplicationController
     @memos = @forum.topics
 
     respond_to do |format|
-      format.html # show.html.erb
+      format.html {
+        render :layout => 'base_forums'
+      }# show.html.erb
       format.json { render json: @forum }
     end
   end
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 60ded0524..1d12ab6db 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -11,17 +11,5 @@
 <%= link_to 'Edit', edit_forum_path(@forum) %> |
 <%= link_to 'Back', forums_path %>
 <%= link_to 'new_topic', new_forum_memo_path(@forum) %>
-<table>
-	<tr>
-		<th>subject</th>
-		<th>content</th>
-		<th>author</th>
-	</tr>
-	<% @memos.each do |memo| %>
-		<tr>
-			<td><%= link_to memo.subject, forum_memo_path(memo) %></td>
-			<td><%= memo.content %></td>
-			<td><%= memo.author %></td>
-		</tr>
-	<% end %>
-</table>
+
+<%= render :partial => 'forums/show_topics', :locals => {:memos => @memos} %>
diff --git a/app/views/memos/new.html.erb b/app/views/memos/new.html.erb
index bf2b573c3..506ddd966 100644
--- a/app/views/memos/new.html.erb
+++ b/app/views/memos/new.html.erb
@@ -1,5 +1,5 @@
 <h1>New memo</h1>
 
-<%= render 'form' %>
+<%= render :partial => 'form' %>
 
 <%= link_to 'Back', forums_path(@forum) %>
\ No newline at end of file