diff --git a/app/controllers/memberships_controller.rb b/app/controllers/memberships_controller.rb
index ae0383f..0052c24 100644
--- a/app/controllers/memberships_controller.rb
+++ b/app/controllers/memberships_controller.rb
@@ -19,7 +19,7 @@ class MembershipsController < ApplicationController
   # POST /memberships.json
   def create
     @membership = Membership.new(params[:membership])
-
+    @membership.fetprofile= Fetprofle.find(params[:fetprofile_id])
     respond_to do |format|
       if @membership.save
         format.html { redirect_to @membership.fetprofile, notice: 'Membership was successfully created.' }
diff --git a/app/models/neuigkeit.rb b/app/models/neuigkeit.rb
index 0aa065a..e9d2242 100755
--- a/app/models/neuigkeit.rb
+++ b/app/models/neuigkeit.rb
@@ -36,4 +36,8 @@ class Neuigkeit < ActiveRecord::Base
   def reverse_publish
     self.datum = nil
   end
+  def text_first_words
+    md = /<p>(?<text>[\w\s,\.!\?]*)/.match self.text
+    md[:text].split(" ")[1..100].join(" ")+ " ..."
+  end
 end
diff --git a/app/uploaders/picture_uploader.rb b/app/uploaders/picture_uploader.rb
index 58d233a..0d136c3 100644
--- a/app/uploaders/picture_uploader.rb
+++ b/app/uploaders/picture_uploader.rb
@@ -35,7 +35,10 @@ class PictureUploader < CarrierWave::Uploader::Base
    version :thumb do
      process :resize_to_fill => [64, 64]
    end
-
+  version :big_thumb do 
+    process :resize_to_fill => [200,200]
+  
+  end
   version :portrait do 
      process :resize_to_fill => [128,192]
      end
diff --git a/app/views/neuigkeiten/_neuigkeit.html.erb b/app/views/neuigkeiten/_neuigkeit.html.erb
index 43b47e1..7a9d70e 100755
--- a/app/views/neuigkeiten/_neuigkeit.html.erb
+++ b/app/views/neuigkeiten/_neuigkeit.html.erb
@@ -1,23 +1,25 @@
 
-<div class="container-fluid"
+<div class="container-fluid">
   <div class="row-fluid">
 	<div class="span9">
 		<%= neuigkeit.rubrik.name %>
 			</div>
 	<div class="span3"><p>
-		<%= neuigkeit.author.email.to_s unless neuigkeit.try(:author).try(:email).to_s %> am 
-		<%= I18n.l neuigkeit.try(:datum).try(:to_date) unless neuigkeit.try(:datum).try(:to_date).nil?  %></p>
+		<%= neuigkeit.author.email.to_s unless neuigkeit.try(:author).try(:email).to_s %> 
+		<%= "am "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil?  %></p>
 	</div>
   </div>
   <div class="row-fluid">
 	<div class="span12">
 		<div class="media">
-		<div class="pull-right" href="#">
+		<div class="pull-left" href="#">
 			<p><br><%= image_tag neuigkeit.picture.thumb.url %></p>
 		</div>
 		<div class="media-body">
 			<h1><%= link_to neuigkeit.title,neuigkeit_path(neuigkeit)  %></h1>
-			<%= raw(neuigkeit.text) %>
+			<%= raw(neuigkeit.text_first_words) unless neuigkeit.text.nil?%>
+		</div>
 		</div>
 	</div>
   </div>
+</div>
diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb
index 47bb223..7db3875 100755
--- a/app/views/neuigkeiten/show.html.erb
+++ b/app/views/neuigkeiten/show.html.erb
@@ -10,15 +10,16 @@
 		<%= @neuigkeit.rubrik.name %>
 			</div>
 	<div class="span3"><p>
-		<%= @neuigkeit.try(:author).email.to_s %> am 
-		<%= I18n.l @neuigkeit.datum.to_date %></p>
+<p>
+		<%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %> 
+		<%= "am " + I18n.l(@neuigkeit.try(:datum).try(:to_date)) unless @neuigkeit.try(:datum).try(:to_date).nil?  %></p>
 	</div>
   </div>
   <div class="row-fluid">
 	<div class="span12">
 		<div class="media">
-		<div class="pull-right" href="#">
-			<p><br><%= "FOTO"  %></p>
+		<div class="pull-left" href="#">
+			<p><br><%= image_tag @neuigkeit.picture.big_thumb.url  %></p>
 		</div>
 		<div class="media-body">
 			<h1><%= link_to @neuigkeit.title,neuigkeit_path(@neuigkeit)  %></h1>