diff --git a/app/views/themengruppen/_themengruppe.html.erb b/app/views/themengruppen/_themengruppe.html.erb
index 3317c92..a514370 100644
--- a/app/views/themengruppen/_themengruppe.html.erb
+++ b/app/views/themengruppen/_themengruppe.html.erb
@@ -1,15 +1,19 @@
-<%= link_to themengruppe,{:class=>'themengruppe'} do %>
+<%= link_to themengruppe,{:class=>'linkbox'} do %>
 <div class="row-fluid">
-  <div class="span2">
-    <%= image_tag themengruppe.picture.thumb.url,{:class=>"img-rounded"} %>
-  </div>
-  <div class="span10">
-    <h3><%=themengruppe.title%> </h3>
+  <div class="span6">
+    <div class="media">
+      <span class="pull-left">
+	<%= image_tag themengruppe.picture.thumb.url,{:class=>"img-rounded"} %>
+      </span>
+      <div class="media-body">
+	<h3><%=themengruppe.title%> </h3>
+      </div>
+    </div>
   </div>
 </div>
-<br/>
 <div class="row-fluid">
-  <div class="span12">
+  <div class="span6">
+
     <p>
       <%= 	if themengruppe.text.split.size > Themengruppe::WORD_COUNT
       themengruppe.text.split[0..Themengruppe::WORD_COUNT].join(" ") + " ..."
@@ -18,18 +22,20 @@
       end%>	
     </p>
   </div>
-</div>
 
-<div class="row-fluid">
-  <div class="span12">
-    <b><%= I18n.t("themengruppe.themen") %></b>
-    <ul>
+  <div class="span6">
+    <!--<b><%= I18n.t("themengruppe.themen") %></b>
+    --><ul>
       <% themengruppe.themen.each do |t| %>
       <li>
 	<%= render t %>
       </li>
       <% end %>
     </ul>
-  </div>
+  </div>  
+
+
+
 </div>
+
 <% end %>
diff --git a/app/views/themengruppen/index.html.erb b/app/views/themengruppen/index.html.erb
index cc80e93..78e4be0 100644
--- a/app/views/themengruppen/index.html.erb
+++ b/app/views/themengruppen/index.html.erb
@@ -1,8 +1,9 @@
-<div class="container-fluid">
-  <% @themengruppen.each_slice(2) do |row| %>
-  <div class="row-fluid"> 
-    <% row.each do |themengruppe| %>
-    <div class="span6 equalheight">
+<ul class="unstyled linkbox-list">
+  <li>  
+    <% @themengruppen.each do |themengruppe| %>
+ 
+    
+    
       <div class="container-fluid">
 	<%= render themengruppe %>
 	<br/>
@@ -12,12 +13,11 @@
 	  -->
 	</div>
       </div>
-      <br/>
-    </div>
-    <% end %>
-  </div>
+    
+    
   <% end %>
-</div>
+  </li>
+</ul>
 
 <br/>