diff --git a/app/controllers/moduls_controller.rb b/app/controllers/moduls_controller.rb
index f5315c9..82a7bd3 100755
--- a/app/controllers/moduls_controller.rb
+++ b/app/controllers/moduls_controller.rb
@@ -18,11 +18,15 @@ class ModulsController < ApplicationController
   # GET /moduls/1.json
   def show
     @modul = Modul.find(params[:id])
+      @toolbar_elements = [{:hicon=>'icon-plus-sign', :text=>I18n.t("lva.add"), :path=>new_lva_path(:modul_id =>@modul.id)}]
+    @toolbar_elements << {:hicon=>'icon-pencil', :text=>I18n.t("modul.edit"), :path=>edit_modul_path(@modul)}
+    @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t("common.delete"),:path=>@modul , :method=>:delete , :data=>{:confirm =>'Are you sure'}}
 
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @modul }
     end
+  
   end
 
   # GET /moduls/new
diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb
index 531109e..4b431e6 100755
--- a/app/controllers/studien_controller.rb
+++ b/app/controllers/studien_controller.rb
@@ -34,6 +34,8 @@ class StudienController < ApplicationController
     @toolbar_elements=[{:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) }]
     @toolbar_elements<<{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)}
     @toolbar_elements<<{:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>"Sure?" }
+    @toolbar_modulgruppen =[ {:hicon=>'icon-plus-sign', :text=> I18n.t('modulgruppe.new'), :path=>new_studium_modulgruppe_path(@studium)}]
+    @toolbar_modulgruppen << {:hicon=>'icon-list', :text => I18n.t('modulgruppe.list'), :path=>modulgruppen_path}
   end
 
   def new
diff --git a/app/views/layouts/_pretty_toolbar.html.erb b/app/views/layouts/_pretty_toolbar.html.erb
index cdbaa85..cb8514a 100644
--- a/app/views/layouts/_pretty_toolbar.html.erb
+++ b/app/views/layouts/_pretty_toolbar.html.erb
@@ -1,8 +1,7 @@
-<div class="row-fluid">
-  <span class="span12">
-
-    <% @toolbar_elements.each do |t| %>
-      <%= link_to '<i class="'.html_safe+ t[:hicon].to_s.html_safe + '"></i>'.html_safe+t[:text], t[:path],:class=>"btn" %>
+<% toolbar_elements = !pretty_toolbar.nil? ? pretty_toolbar : @toolbar_elements %>
+<span class="label"><%= I18n.t("common.actions")%></span>
+ <div class="btn-group">
+<% toolbar_elements.each do |t| %>
+      <%= link_to '<i class="'.html_safe+ t[:hicon].to_s.html_safe + '"></i>'.html_safe+t[:text], t[:path], :method=>t[:method], :confirm=>t[:confirm].to_s, :data=>t[:data], :class=>"btn" %>
     <% end %>
-  </span>
 </div>
diff --git a/app/views/studien/semesteransicht.html.erb b/app/views/studien/semesteransicht.html.erb
index a46b9fe..62c81eb 100644
--- a/app/views/studien/semesteransicht.html.erb
+++ b/app/views/studien/semesteransicht.html.erb
@@ -14,4 +14,4 @@
     </div>
 <% end %>
 
-<%= render :partial=>'layouts/pretty_toolbar' %>
+<%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
index 96ff5e8..20632c0 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -16,4 +16,6 @@
       </div>
     <% end %>
   <% end %>
-<%= render :partial=>'layouts/pretty_toolbar' %>
+  <%= render 'layouts/pretty_toolbar'%><br>
+  <%= render 'layouts/pretty_toolbar', :pretty_toolbar=>@toolbar_modulgruppen %>
+</div>