diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb
index 3b2fe05..da5d9da 100755
--- a/app/controllers/studien_controller.rb
+++ b/app/controllers/studien_controller.rb
@@ -34,15 +34,20 @@ class StudienController < ApplicationController
     
     @toolbar_elements=[{:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) },
                        {:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)},
-                       {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>"Sure?" }]
+                       {: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)},
                              {:hicon=>'icon-list', :text => I18n.t('modulgruppe.list'), :path=>modulgruppen_path}]
-    
-    if params[:ansicht] != 'modulgruppenansicht'
+    case params[:ansicht]
+    when 'semesteransicht'
       @text = 'Zu Modulansicht wechseln'
       @flip = 'modulgruppenansicht'
-      render 'semesteransicht'
+   #   render 'semesteransicht'
+   
+    when 'infoansicht'
+      @text = 'Zu Modulansicht wechseln'
+      @flip = 'modulgruppenansicht'
+
     else
       @text = 'Zu Semesteransicht wechseln'
       @flip = 'semesteransicht'
@@ -242,14 +247,14 @@ class StudienController < ApplicationController
   end
 
   def default_url_options
-    {:ansicht=> params[:ansicht],
+   
+    super.merge({:ansicht=> params[:ansicht],
       :std_verw=> params[:std_verw],
       :mg_verw=> params[:mg_verw],
       :m_verw=>params[:m_verw],
       :lva_verw=>params[:lva_verw],
       :b_verw=>params[:b_verw],
-      :lec_verw=>params[:lec_verw]}.merge(super)
-    
-
+      :lec_verw=>params[:lec_verw]})
   end
+
 end
diff --git a/app/views/modulgruppen/_modulgruppe.html.erb b/app/views/modulgruppen/_modulgruppe.html.erb
index 503dc7b..9c598eb 100755
--- a/app/views/modulgruppen/_modulgruppe.html.erb
+++ b/app/views/modulgruppen/_modulgruppe.html.erb
@@ -2,7 +2,7 @@
   <h2><%=  link_to modulgruppe.name, modulgruppe_path(modulgruppe) %> 
   </h2> 
 
-  <%= modulgruppe.desc%><ul>
+  <%= modulgruppe.desc%><ul class="unstyled">
   <%= render :partial=>'moduls/kurz', :collection=>modulgruppe.moduls, :as=>:modul%>
   </ul>
   <br>
diff --git a/app/views/moduls/_kurz.html.erb b/app/views/moduls/_kurz.html.erb
index 793dd3f..071a302 100755
--- a/app/views/moduls/_kurz.html.erb
+++ b/app/views/moduls/_kurz.html.erb
@@ -1,6 +1,19 @@
-<li><p>
+<li>
+<div class="contentbox">
+<p>
   <b><% if !modul.name.nil? %><%= link_to "Modul "+ modul.name , modul_path(modul) %> <%end%></b>
 </p>
+<ul>
+<% modul.lvas.each do |lva| %>
+<li> 	      <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => lva}%>
+
+</li>
+<% end %>
+
+
+</ul>
+
 <% link_to '<i class="icon-pencil"></i>'.html_safe+I18n.t("common.edit"), edit_modul_path(modul) %>
+</div>
 </li>
 
diff --git a/app/views/studien/_infoansicht.html.erb b/app/views/studien/_infoansicht.html.erb
new file mode 100644
index 0000000..30ea4c5
--- /dev/null
+++ b/app/views/studien/_infoansicht.html.erb
@@ -0,0 +1,9 @@
+
+<div class="container-fluid">
+  <div class="row-fluid">
+       <div class="span12">
+	<%= raw(@studium.desc) %>
+      </div>
+    </div>
+
+  </div>
diff --git a/app/views/studien/_modulgruppenansicht.html.erb b/app/views/studien/_modulgruppenansicht.html.erb
new file mode 100644
index 0000000..d2867d9
--- /dev/null
+++ b/app/views/studien/_modulgruppenansicht.html.erb
@@ -0,0 +1,22 @@
+<div class="container-fluid">
+
+  <div class="row-fluid">
+    <% if params[:info].true? %>
+    <%= raw(@studium.desc) %>
+    <% else %>
+    <%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
+    <% end %>
+
+
+    <% @studienphasen.each do |sp| %>
+      <% sp[:modulgruppen].each do |row| %>
+	<div class="row-fluid">
+	  <% row.each do |modulgruppe| %>
+	    <div class="span<%= sp[:width]%> min-width:13em;">
+	      <%= render modulgruppe %>
+	    </div>
+	  <% end %>
+	</div>
+      <% end %>
+    <% end %>
+  </div>
diff --git a/app/views/studien/_semesteransicht.html.erb b/app/views/studien/_semesteransicht.html.erb
new file mode 100644
index 0000000..416e667
--- /dev/null
+++ b/app/views/studien/_semesteransicht.html.erb
@@ -0,0 +1,34 @@
+
+<div class="container-fluid">
+    <% if params[:info].true? %>
+    <%= raw(@studium.desc) %>
+    <% else %>
+    <%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
+    <% end %>
+
+    <% @studium.semester.each do |sem| %>
+    <div class="row-fluid">
+      <div class="span12">
+	<div class="contentbox">
+	  <div class="container-fluid">
+	    <div class="row-fluid">
+	      <div class="span8">
+		<h2><%= sem.name %></h2>
+	      </div>
+	      <div class="span4"><div class="pull-right"><%= link_to I18n.t("lva.addrem"), edit_semester_path(sem), :class=>"btn-small"%>
+		</div>
+	      </div>
+	    </div>
+	    <% sem.lvas.each do |lva| %>
+	    <div class="row-fluid">
+	      <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => lva}%>
+	    </div>
+	    <% end %>
+	  </div>
+	</div>
+      </div>
+    </div>
+    <% end %>
+
+  <%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
+</div>
diff --git a/app/views/studien/_studium.html.erb b/app/views/studien/_studium.html.erb
index f7b116d..3aca56d 100644
--- a/app/views/studien/_studium.html.erb
+++ b/app/views/studien/_studium.html.erb
@@ -1,4 +1,4 @@
-<%= link_to studium_path(studium, :ansicht=>'semesteransicht') ,{:class=>"linkbox"} do %>
+<%= link_to studium_path(studium, {:ansicht=>'semesteransicht'}) ,{:class=>"linkbox"} do %>
 <div class="media">
   <div class="pull-left">
     <%= image_tag studium.picture.big_thumb.url %>
diff --git a/app/views/studien/infoansicht.html.erb b/app/views/studien/infoansicht.html.erb
new file mode 100644
index 0000000..153ae0a
--- /dev/null
+++ b/app/views/studien/infoansicht.html.erb
@@ -0,0 +1,26 @@
+    <%= render 'studien/tabs' %>
+	<div class="content-wrap content-column">
+
+<div class="container-fluid">
+  <div class="row-fluid">
+
+    <div class="span6">    
+      <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
+    </div>
+    <div class="span3 pull-right">
+      <div class="pull-right"> 
+	<%= link_to @text, studium_path(@studium, :ansicht=>@flip), :class=>"btn" %>
+	<%= link_to "Infoansicht", studium_path(@studium, :ansicht=>'infoansicht'), :class=>"btn" unless params[:ansicht]=='infoansicht'%>
+
+      </div>
+    </div>
+
+    <div class="row-fluid">
+      <div class="span12"x>
+
+	<%= raw(@studium.desc) %>
+      </div>
+    </div>
+
+  </div>
+  </div>
diff --git a/app/views/studien/semesteransicht.html.erb b/app/views/studien/semesteransicht.html.erb
index 0ed3300..5ea2bde 100644
--- a/app/views/studien/semesteransicht.html.erb
+++ b/app/views/studien/semesteransicht.html.erb
@@ -2,8 +2,14 @@
 <div class="container-fluid">
   <div class="row-fluid">
     <%= render 'studien/tabs' %>
-    <div class="span6">    <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1></div>
-    <div class="span3 pull-right"><div class="pull-right"> <%= link_to @text, studium_path(@studium, :ansicht=>@flip), :class=>"btn" %></div>
+    <div class="span6">    
+      <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
+    </div>
+    <div class="span3 pull-right">
+      <div class="pull-right"> 
+	<%= link_to @text, studium_path(@studium, :ansicht=>@flip), :class=>"btn" %>
+	<%= link_to "Infoansicht", studium_path(@studium, :ansicht=>'infoansicht'), :class=>"btn" unless params[:ansicht]=='infoansicht'%>     
+ </div>
     </div>
   </div>
 
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
index 8b5e6fc..18646e0 100644
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -1,32 +1,25 @@
-<div class="container-fluid">
-  <div class="row-fluid">
-    <%= render 'studien/tabs' %>
+<%= render 'studien/tabs' %>
+<div class="content-wrap content-column">
+  <p id="notice"><%= notice %></p>
+  <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
+  <p>
+      <div class="pull-right">
+	<%= link_to @text, studium_path(@studium, :ansicht=>@flip), :class=>"btn" %>
+	<%= link_to "Infoansicht", studium_path(@studium, :ansicht=>"infoansicht"), :class=>"btn" %>
+      </div>
+  </p>
+  <% if params[:ansicht]=='modulgruppenansicht' %>
+  <%= render partial: 'modulgruppenansicht' %>
+  <% else if params[:ansicht]=='infoansicht' %>
+    <%= render partial: 'infoansicht' %>
+  <% else %>
+    <%= render partial: 'semesteransicht' %>
+ 
 
-    <p id="notice"><%= notice %></p>
-    <div class="span6">    <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1></div>
-    <div class="span3 pull-right"><div class="pull-right"><%= link_to @text, studium_path(@studium, :ansicht=>@flip), :class=>"btn" %></div>
-    </div>
-  </div>
-  <div class="row-fluid">
-    <% if params[:info].true? %>
-    <%= raw(@studium.desc) %>
-    <% else %>
-    <%= @studium.desc_first_words %> <%= link_to I18n.t('studium.info'), studium_path(@studium, :ansicht=>params[:ansicht], :info=>true) %>
-    <% end %>
+  <% end %>
 
+ <% end %>
 
-    <% @studienphasen.each do |sp| %>
-      <% sp[:modulgruppen].each do |row| %>
-	<div class="row-fluid">
-	  <% row.each do |modulgruppe| %>
-	    <div class="span<%= sp[:width]%> min-width:13em;">
-	      <%= render modulgruppe %>
-	    </div>
-	  <% end %>
-	</div>
-      <% end %>
-    <% end %>
-  </div>
   <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %><br>
   <%= render 'layouts/pretty_toolbar' %>
 </div>