diff --git a/app/assets/stylesheets/themengruppen.css.scss b/app/assets/stylesheets/themengruppen.css.scss
index ef430a7..a882e6e 100644
--- a/app/assets/stylesheets/themengruppen.css.scss
+++ b/app/assets/stylesheets/themengruppen.css.scss
@@ -9,10 +9,10 @@ div.sticker
 	border-radius: 5px;
 	text-align: center;
 	padding: 5px;
-margin:auto;
+margin:auto;		
 }
 div.sticker-red
-{	background: red;
+{	border:solid  red;
 }
 div.sticker-yellow
 {	background: yellow;
diff --git a/app/assets/stylesheets/themes/blue2/application.css.scss b/app/assets/stylesheets/themes/blue2/application.css.scss
index ab51e8b..6276bbd 100755
--- a/app/assets/stylesheets/themes/blue2/application.css.scss
+++ b/app/assets/stylesheets/themes/blue2/application.css.scss
@@ -43,7 +43,7 @@ $linkColor: $color_prim;
 $linkColorHover: $color_schema_1;
 $white: #FFFFFF;
 
-$bodyBackground: #FEFEFE;
+$bodyBackground: #FFF; //#FEFEFE;
 
 
 
@@ -116,7 +116,7 @@ $navbar-li-minwidth: 0;
 
 
 $box-border: lightgray solid 1px;
-$box-border-radius:0px;
+$box-border-radius:4px;
 $box-background: white;
 
 @import 'layout';
@@ -125,6 +125,6 @@ $box-background: white;
 
 @import 'extra';
 body {
-background: #EFEFEF;
+background: #FFF; //#EFEFEF;
 background-size:100%;
 }
diff --git a/app/views/attachments/refresh_list.js.erb b/app/views/attachments/refresh_list.js.erb
index 4354d7f..8a0501d 100644
--- a/app/views/attachments/refresh_list.js.erb
+++ b/app/views/attachments/refresh_list.js.erb
@@ -1,5 +1,5 @@
 $("#<%= Attachment.parent_attachment_list_id(@parent) %>").replaceWith("<%= escape_javascript ( render partial:"attachments/attachment_list", object:@attachments, locals: {editor: true, parent: @parent} ) %>")
 <% if @parent.is_a?(Neuigkeit) %>
-<% @neuigkeit=@parent; @rubrik=@neuigkeit.rubrik %>
-<%= render "neuigkeiten/show", object: @neuigkeit %>
+	<% @neuigkeit=@parent %>
+	<%= render "neuigkeiten/show", object: @parent, locals: {show: @parent} %>
 <% end %>
diff --git a/app/views/neuigkeiten/_neuigkeit_edit.html.erb b/app/views/neuigkeiten/_neuigkeit_edit.html.erb
index 13a088e..6a80568 100644
--- a/app/views/neuigkeiten/_neuigkeit_edit.html.erb
+++ b/app/views/neuigkeiten/_neuigkeit_edit.html.erb
@@ -35,7 +35,7 @@
     <% end %>
     <div class="media-body">
 			<h1 itemprop="name" class="editable_simple" data-target="#neuigkeit_title">
-				<%=  @neuigkeit.title%>
+				<%=  raw(@neuigkeit.title) %>
 			</h1>
 			<div itemprop="articleBody" class="editable" data-target="#neuigkeit_text">
 				<%= raw(@neuigkeit.text) %>
@@ -45,13 +45,7 @@
 			
 		</div>
   </div>
-  <div id="calentries">
-		<% unless neuigkeit_edit.calentries.nil? || neuigkeit_edit.calentries.empty? %>
-			<% neuigkeit_edit.calentries.each do |ce|%>
-				<%= render ce , object: ce unless ce.nil? %>
-			<% end %>
-		<% end %>
-	</div>
+
   <%= f.actions do %>
   <%= f.action :submit, :as => :input %>
   <% end %>
@@ -59,18 +53,13 @@
 	<div class="fb-like" data-href"<%= rubrik_neuigkeit_url(@rubrik,@neuigkeit,{themes: nil, locale: nil})%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>
 	<% unless @neuigkeit.meeting.nil? %>
 		<%= render @neuigkeit.meeting %>
-	<% end%>
-	<div id="calentry_new" ><%= link_to "new Calentry",  new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true if can? :edit, @neuigkeit  %>
-	</div>
+	<% end%>		
+	<% end%>	
 	
-	
-	<%= render_attachments_for(@neuigkeit) %>
+
+
 	<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
-	<%= render partial: 'nlink_list_whole', :object=>@neuigkeit.nlinks %>
-	<% if can? :find_link , @neuigkeit %>
-		<a id="findlink-open" href="#"><%= fa_icon("link")%> Neue Verknüpfungen </a>
-	<% end %>
-	<% end %>
+	
 </div>
 <%= tinymce :inline_div %>
 <%= tinymce :inline_simple %>
diff --git a/app/views/neuigkeiten/_neuigkeit_view.html.erb b/app/views/neuigkeiten/_neuigkeit_view.html.erb
index 3658f9b..2afa145 100644
--- a/app/views/neuigkeiten/_neuigkeit_view.html.erb
+++ b/app/views/neuigkeiten/_neuigkeit_view.html.erb
@@ -1,53 +1,52 @@
 <div id="neuigkeit_<%=  neuigkeit_view.id %>" class="contentbox" itemscope itemtype="http://schema.org/Article">
-  <meta itemprop="about" content="<%= @neuigkeit.text_first_words %>"/>
-  <meta itemprop="sameAs" content="<%= neuigkeit_url(@neuigkeit,:theme=>nil)%>"/>
-  <meta itemprop="url" content="<%= neuigkeit_url(@neuigkeit,:theme=>nil)%>"/>
+  <meta itemprop="about" content="<%= neuigkeit_view.text_first_words %>"/>
+  <meta itemprop="sameAs" content="<%= neuigkeit_url(neuigkeit_view,:theme=>nil)%>"/>
+  <meta itemprop="url" content="<%= neuigkeit_url(neuigkeit_view,:theme=>nil)%>"/>
   
   <div class="media">
 	  <span itemprop="articleSection">
-			<%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %>&nbsp;<%= @neuigkeit.rubrik.name %>
+			<%= ff_icon(neuigkeit_view.rubrik.icon) unless neuigkeit_view.rubrik.icon.nil? or neuigkeit_view.rubrik.icon.empty? %>&nbsp;<%= neuigkeit_view.rubrik.name %>
     </span>
     <span class="pull-right">
-			<span itemprop="author"><%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %> 
-				<%= @neuigkeit.author.text %></span>
-			<% unless @neuigkeit.try(:datum).try(:to_date).nil? %>
-				<%= " "+ I18n.t("neuigkeit.am")+" " %><span itemprop="datePublished"><%= I18n.l(@neuigkeit.try(:datum).try(:to_date))   %>
+			<span itemprop="author"><%= neuigkeit_view.author.email.to_s unless neuigkeit_view.try(:author).try(:email).to_s %> 
+				<%= neuigkeit_view.author.text %></span>
+			<% unless neuigkeit_view.try(:datum).try(:to_date).nil? %>
+				<%= " "+ I18n.t("neuigkeit.am")+" " %><span itemprop="datePublished"><%= I18n.l(neuigkeit_view.try(:datum).try(:to_date))   %>
 				</span>
 			<% end %>
   </div>
-  <% unless @neuigkeit.published? %> 
-    <div class="sticker sticker-red"> Not Published</div> 
+  <% unless neuigkeit_view.published? %> 
+    <div class="sticker sticker-red"> Not Published <%= link_to "Publish", publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),remote:true, class: :btn if can? :publish, neuigkeit_view %></div> 
 	<% end %>
-  <% unless @neuigkeit.origurl.nil? || @neuigkeit.origurl.empty? %>
-		<div class="alert"><%= link_to "Zitiert von "+ @neuigkeit.origurl, @neuigkeit.origurl %>
+  <% unless neuigkeit_view.origurl.nil? || neuigkeit_view.origurl.empty? %>
+		<div class="alert"><%= link_to "Zitiert von "+ neuigkeit_view.origurl, neuigkeit_view.origurl %>
 		</div>    
   <% end %>
   <div class="media">
-    <% unless @neuigkeit.picture_robust.big_thumb.to_s.empty? %>
+    <% unless neuigkeit_view.picture_robust.big_thumb.to_s.empty? %>
 			<div class="pull-left" href="#">
-				<p><br><%= link_to image_tag(@neuigkeit.picture_robust.big_thumb.url),@neuigkeit.picture_robust.try(:url)  %>
+				<p><br><%= link_to image_tag(neuigkeit_view.picture_robust.big_thumb.url),neuigkeit_view.picture_robust.try(:url)  %>
 				</p>
 			</div>
     <% end %>
     <div class="media-body">
 			<h1 itemprop="name">
-				<%=  @neuigkeit.title%>				<%= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(@neuigkeit), remote: true if can? :edit, @neuigkeit %>
+				<%= raw(neuigkeit_view.title) %>				<%= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(neuigkeit_view.rubrik, neuigkeit_view), remote: true if can? :edit, neuigkeit_view %>
 			</h1>
 			<div itemprop="articleBody">
-				<%= raw(@neuigkeit.text) %>
+				<%= raw(neuigkeit_view.text) %>
 			</div>
 		</div>
   </div>
-<%= render_calentries_for(@neuigkeit)%>
+<%= render_calentries_for(neuigkeit_view)%>
 
-	<div class="fb-like" data-href"<%= rubrik_neuigkeit_url(@rubrik,@neuigkeit,{themes: nil, locale: nil})%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>
-	<% unless @neuigkeit.meeting.nil? %>
-		<%= render @neuigkeit.meeting %>
+	<% unless neuigkeit_view.meeting.nil? %>
+		<%= render neuigkeit_view.meeting %>
 	<% end%>
 
 	
 	
-	<%= render_attachments_for(@neuigkeit) %>
+	<%= render_attachments_for(neuigkeit_view) %>
 
 	<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
 </div>
diff --git a/app/views/neuigkeiten/_show.js.erb b/app/views/neuigkeiten/_show.js.erb
index d3a1534..71c4e5d 100644
--- a/app/views/neuigkeiten/_show.js.erb
+++ b/app/views/neuigkeiten/_show.js.erb
@@ -1 +1,2 @@
-$('#neuigkeit_<%= @neuigkeit.id %>').replaceWith("<%= escape_javascript( render partial:"neuigkeiten/neuigkeit_view", object: @neuigkeit )%>"); 
+<% show = @neuigkeit %>
+$('#neuigkeit_<%= show.id %>').replaceWith("<%= escape_javascript( render partial:"neuigkeiten/neuigkeit_view", object: show )%>"); 
diff --git a/app/views/neuigkeiten/show.js.erb b/app/views/neuigkeiten/show.js.erb
index 6cdaf58..49e6de1 100644
--- a/app/views/neuigkeiten/show.js.erb
+++ b/app/views/neuigkeiten/show.js.erb
@@ -1,3 +1,3 @@
-<%= render "show" %> 
+<%= render "show", object: @neuigkeit %>