diff --git a/app/views/layouts/_pretty_toolbar.html.erb b/app/views/layouts/_pretty_toolbar.html.erb
index cb8514a..09c0a6c 100644
--- a/app/views/layouts/_pretty_toolbar.html.erb
+++ b/app/views/layouts/_pretty_toolbar.html.erb
@@ -1,3 +1,9 @@
+
<% toolbar_elements = !pretty_toolbar.nil? ? pretty_toolbar : @toolbar_elements %>
<%= I18n.t("common.actions")%>
diff --git a/app/views/layouts/_topbar.html.erb b/app/views/layouts/_topbar.html.erb
index 2a4c0de..13307ae 100755
--- a/app/views/layouts/_topbar.html.erb
+++ b/app/views/layouts/_topbar.html.erb
@@ -1,3 +1,11 @@
+
+
+
<% topbar = !topbar.nil? ? topbar : @topbar_elements %>
<% topbar.each do |tb| %>
diff --git a/app/views/modulgruppen/_modulgruppe.html.erb b/app/views/modulgruppen/_modulgruppe.html.erb
index e897957..0e3f9d4 100755
--- a/app/views/modulgruppen/_modulgruppe.html.erb
+++ b/app/views/modulgruppen/_modulgruppe.html.erb
@@ -8,10 +8,5 @@
<% link_to ''.html_safe+I18n.t("common.edit"), edit_modulgruppe_path(modulgruppe) %>
-
-
-
-
-
diff --git a/app/views/studien/_studium.html.erb b/app/views/studien/_studium.html.erb
index 04a654a..791402a 100644
--- a/app/views/studien/_studium.html.erb
+++ b/app/views/studien/_studium.html.erb
@@ -1,9 +1,7 @@
-
<%= link_to studium.name + " " + studium.zahl.to_s, studium_semesteransicht_path(studium)%>
-
- - <%= studium.typ%>
- - Beschreibung:
- <%= !(studium.desc.to_s == "") ? studium.desc.html_safe : I18n.t("keine.beschreibung")%>
- - <%=link_to "Link zur Modulgruppenansicht",studium_path(studium) %>
+ <%= link_to studium.name + " " + studium.zahl.to_s, studium_semesteransicht_path(studium)%>
<%= studium.typ%>
+ Beschreibung:
+ <%= !(studium.desc.to_s == "") ? studium.desc.html_safe : I18n.t("keine.beschreibung")%>
+ <%=link_to "Link zur Modulgruppenansicht",studium_path(studium) %>
diff --git a/app/views/studien/index.html.erb b/app/views/studien/index.html.erb
index c67e6c9..e707018 100755
--- a/app/views/studien/index.html.erb
+++ b/app/views/studien/index.html.erb
@@ -1,14 +1,18 @@
+
<%= render 'layouts/topbar' %>
+
<%= I18n.t("studien.list") %>
<% @studien.sort_by{|z| z[:zahl]}.each do |studium| %>
-
+
+ <%= render studium%>
+
<% end %>
+
+
<%= render :partial=>'layouts/pretty_toolbar'%>
-<% #toolbar_html(@toolbar_elements) %>
+
diff --git a/app/views/studien/semesteransicht.html.erb b/app/views/studien/semesteransicht.html.erb
index 22c82c2..e2047ab 100644
--- a/app/views/studien/semesteransicht.html.erb
+++ b/app/views/studien/semesteransicht.html.erb
@@ -1,17 +1,23 @@
-<%= render :partial=>'layouts/topbar'%>
-
-<%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)
-<%= raw(@studium.desc) %>
-<% @studium.semester.each do |sem| %>
+
+ <%= render :partial=>'layouts/topbar'%>
-
<%= sem.name %>
-
-
- <% sem.lvas.sort_by{|n| n[:name]}.each do |l| %>
- - <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%>
- <% end %>
-
-
-<% end %>
+
<%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)
+ <%= raw(@studium.desc) %>
+ <% @studium.semester.each do |sem| %>
-<%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
+
+
+
<%= sem.name %>
+
+ <% sem.lvas.sort_by{|n| n[:name]}.each do |l| %>
+
+
+ <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%>
+
+ <% end %>
+
+
+ <% end %>
+
+ <%= 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 e813c9c..98a40f8 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -1,23 +1,24 @@
-<%= render 'layouts/topbar'%>
+
+ <%= render 'layouts/topbar'%>
<%= notice %>
<%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)
- <%= raw(@studium.desc) %>
- <% @studienphasen.each do |sp| %>
- <% sp[:modulgruppen].each do |row| %>
-
- <% row.each do |modulgruppe| %>
-
- <%= render modulgruppe %>
-
- <% end %>
-
+ <%= raw(@studium.desc) %>
+ <% @studienphasen.each do |sp| %>
+ <% sp[:modulgruppen].each do |row| %>
+
+ <% row.each do |modulgruppe| %>
+
+ <%= render modulgruppe %>
+
+ <% end %>
+
+ <% end %>
<% end %>
- <% end %>
- <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
-
+ <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
+
<%= render 'layouts/pretty_toolbar' %>