diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb
index fd37e29..e867eed 100755
--- a/app/views/forums/index.html.erb
+++ b/app/views/forums/index.html.erb
@@ -22,7 +22,8 @@
         <tr>
           <td class="icon"><%= image_tag 'ruby.png' %></td>
           <td class="description">
-            <%= link_to forum.title, forum_path(forum) %><br />
+            <%= link_to forum.title, forum_path(forum) %>
+            <br />
             <span class="smaller"><%= forum.description %></span><br />
           </td>
           <td class="counts smaller"><%= forum.topics.size %></td>
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 305069b..5f41a2d 100755
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -30,8 +30,15 @@
       <% @topics.each do |topic| %>
       <tr>
         <td class="icon"><%= image_tag 'ruby.png' %></td>
-        <td class="description">
-          <%= link_to topic.title, topic_path(topic) %><br />
+        <td class="description"> 
+          <% if topic.sticky %>
+            <span class="label label-info">Sticky</span>
+          <% end %>
+          <% if topic.locked %>
+            <span class="label label-important">Locked</span>
+          <% end %>
+          <%= link_to topic.title, topic_path(topic) %>
+          <br />
           <span class="smaller">by <%= topic.user.username %></span>
         </td>
         <td class="counts smaller"><%= topic.posts.size - 1 %></td>
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index 4115bd8..a0ecbea 100755
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -1,6 +1,12 @@
 <div class="right controls"><%= link_to "Back to Forum", forum_path(@topic.forum) %></div>
 <div class="module">
   <div class="module_header">
+    <% if @topic.sticky %>
+      <span class="label label-info">Sticky</span>
+    <% end %>
+    <% if @topic.locked %>
+      <span class="label label-important">Locked</span>
+    <% end %>
     <%= @topic.title %>
     <span class="right controls">
       <%= link_to "Edit", edit_topic_path(@topic) if can? :manage, @topic %>