diff --git a/app/views/themes/blue2/neuigkeiten/_menu.html.erb b/app/views/themes/blue2/neuigkeiten/_menu.html.erb
index be97b1c..21efba9 100644
--- a/app/views/themes/blue2/neuigkeiten/_menu.html.erb
+++ b/app/views/themes/blue2/neuigkeiten/_menu.html.erb
@@ -1,6 +1,8 @@
-<span class="btn-group">
+
 	<%= link_to(fa_icon("edit"), edit_rubrik_neuigkeit_path( @neuigkeit.rubrik,  @neuigkeit), remote: true , class: "btn") if can? :edit, @neuigkeit %>
-	<%= link_to fa_icon("paperclip"), "#", class: "btn", id: "attachments-form-open"%>	
+<span class="btn-group">
+	<%= link_to fa_icon("paperclip"), "#", class: "btn", id: "attachments-form-open" if can? :edit, @neuigkeit %>	
+	<%= link_to fa_icon("calendar-o"),  new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true, class: :btn if can? :edit, @neuigkeit %>
 </span>
 
 <%  if can?(:edit, @neuigkeit) %>
@@ -8,12 +10,14 @@
 		<%= link_to fa_icon("plus"), "#", class: "btn dropdown-toggle", data: {toggle: "dropdown"}, title: "plus" %>
 		<ul class="dropdown-menu">
 			<li>
-				<%= link_to fa_icon("calendar-o")+" Neuer Kalendareintrag",  new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true if can? :edit, @neuigkeit %>
+			
 				
 			</li>
 		</ul>
 	</div>
 <% end %>
+	<%= new_question_for(@neuigkeit) if can? :new, Survey::Question %>
+
 <div class="dropdown pull-right">
 	<a class="dropdown-toggle btn" data-toggle="dropdown" title="publish" href="#"><%= fa_icon("mail-forward")%></a>
 	<ul class="dropdown-menu">
diff --git a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb
index 2512b39..0f184f5 100644
--- a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb
+++ b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb
@@ -61,7 +61,6 @@
 
 
 
-	<%= new_question_for(neuigkeit_view) if can? :new, Survey::Question %>
 	<% @questions.each do |q| %>
 		<%= render q if can? :show, q %>
 	<% end %>