diff --git a/app/models/themengruppe.rb b/app/models/themengruppe.rb
index 7cee6f8..ef59efd 100644
--- a/app/models/themengruppe.rb
+++ b/app/models/themengruppe.rb
@@ -11,9 +11,10 @@
 
 class Themengruppe < ActiveRecord::Base
   WORD_COUNT = 50
-  attr_accessible :text, :title
+  attr_accessible :text, :title, :picture
   has_many :themen, class_name: 'Thema'
   has_many :fragen, through: :themen
+  mount_uploader :picture, PictureUploader
   
   validates :title, :presence => true
 
diff --git a/app/views/themen/_form.html.erb b/app/views/themen/_form.html.erb
index 0444d68..53e9944 100644
--- a/app/views/themen/_form.html.erb
+++ b/app/views/themen/_form.html.erb
@@ -2,6 +2,7 @@
 <%= semantic_form_for @thema do |f| %>
   <%= f.inputs do %>
     <%= f.input :title %>
+    <%= f.input :picture, :as => :file %>
     <%= f.input :themengruppe %>
     <%= f.input :text, :as=>:tinymce_text%>
   <% end %>
diff --git a/app/views/themengruppen/_form.html.erb b/app/views/themengruppen/_form.html.erb
index c81d3ff..783961e 100644
--- a/app/views/themengruppen/_form.html.erb
+++ b/app/views/themengruppen/_form.html.erb
@@ -1,7 +1,9 @@
 <%= semantic_form_for @themengruppe do |f| %>
   <%= f.inputs do %>
     <%= f.input :title %>
+    <%= f.input :picture, :as => :file %>
     <%= f.input :text %>
+
   <% end %>
 
   <%= f.actions do %>
diff --git a/app/views/themengruppen/_themengruppe.html.erb b/app/views/themengruppen/_themengruppe.html.erb
index 450e18e..717b3ab 100644
--- a/app/views/themengruppen/_themengruppe.html.erb
+++ b/app/views/themengruppen/_themengruppe.html.erb
@@ -1,18 +1,34 @@
-
-<h3> <%=  link_to themengruppe.title, themengruppe %> </h3>
-<p>
-  <%= 	if themengruppe.text.split.size > Themengruppe::WORD_COUNT
-			themengruppe.text.split[0..Themengruppe::WORD_COUNT].join(" ") + " ..."
-		else
-			themengruppe.text
-		end%>
-</p>
+<div class="row-fluid">
+	<div class="span2">
+		<%= image_tag themengruppe.picture.thumb.url,{:class=>"img-circle"} %>
+	</div>
+	<div class="span10">
+		 <h3><%=  link_to themengruppe.title, themengruppe %> </h3>
+	</div>
+</div>
 <br/>
-<b><%= I18n.t("themengruppe.themen") %></b>
-<ul>
-	<% themengruppe.themen.each do |t| %>
-		<li>
-		<%= render t %>
-		</li>
-	<% end %>
-</ul>
+<div class="row-fluid">
+	<div class="span12">
+	<p>
+	<%= 	if themengruppe.text.split.size > Themengruppe::WORD_COUNT
+				themengruppe.text.split[0..Themengruppe::WORD_COUNT].join(" ") + " ..."
+			else
+				themengruppe.text
+	end%>	
+	</p>
+	</div>
+</div>
+
+<div class="row-fluid">
+	<div class="span12">
+		<b><%= I18n.t("themengruppe.themen") %></b>
+		<ul>
+			<% themengruppe.themen.each do |t| %>
+				<li>
+				<%= render t %>
+				</li>
+			<% end %>
+		</ul>
+	</div>
+</div>
+
diff --git a/app/views/themengruppen/index.html.erb b/app/views/themengruppen/index.html.erb
index b1ae6d9..6c33445 100644
--- a/app/views/themengruppen/index.html.erb
+++ b/app/views/themengruppen/index.html.erb
@@ -1,21 +1,23 @@
 <div class="container-fluid">
-
-  <% @themengruppen.each_slice(2) do |row| %>
-  <div class="row-fluid"> 
-    <% row.each do |themengruppe| %>
-    <div class="span6 equalheight">
-      <div class="themengruppe">
-	<%= render themengruppe %>
-	<p>
-	  <%= link_to 'Edit', edit_themengruppe_path(themengruppe) %>
-	</p>
-      </div>
-    </div>
-    <% end %>
-  </div>
-  <% end %>
+	<% @themengruppen.each_slice(2) do |row| %>
+	<div class="row-fluid"> 
+		<% row.each do |themengruppe| %>
+		<div class="span6 equalheight">
+			<div class="container-fluid">
+				<%= render themengruppe %>
+				<br/>
+				<div class="row-fluid">
+					<%= link_to 'Edit', edit_themengruppe_path(themengruppe) %>
+				</div>
+			</div>
+		<br/>
+		</div>
+		<% end %>
+	</div>
+	<% end %>
 </div>
-<br />
+
+<br/>
 
 <script class="hidden-phone">
 
diff --git a/config/routes.rb b/config/routes.rb
index 22924ab..cef5142 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -66,6 +66,7 @@
      
     
      resources :beispiele
+     resources :attachment
      resources :themen
      resources :themengruppen do
        resources :themen, :only=>[:new, :show]
diff --git a/db/migrate/20130823105422_add_picture_to_themengruppe.rb b/db/migrate/20130823105422_add_picture_to_themengruppe.rb
new file mode 100644
index 0000000..392c8b3
--- /dev/null
+++ b/db/migrate/20130823105422_add_picture_to_themengruppe.rb
@@ -0,0 +1,5 @@
+class AddPictureToThemengruppe < ActiveRecord::Migration
+  def change
+	add_column :themengruppen, :picture, :string
+  end
+end