diff --git a/app/controllers/coaches_controller.rb b/app/controllers/coaches_controller.rb
index 1c1344d5..6c6eb326 100644
--- a/app/controllers/coaches_controller.rb
+++ b/app/controllers/coaches_controller.rb
@@ -10,25 +10,39 @@ def new
   def create
     @coach = Coach.new(coach_params)
     if @coach.save
-      redirect_to coach_url(@coach)
+      redirect_to edit_coach_path(@coach)
     else
       render :new
     end
   end
 
+  def edit
+    @coach = find_coach
+  end
+
+  def update
+    @coach = Coach.find(params[:id])
+    if !@coach.update(coach_params)
+      render :edit
+    end
+  end
+
   def show
-    @user = current_user
-    @coach = @user.coach
+    @coach = Coach.find(params[:id])
   end
-  
+
   private
-    def coach_params
-      params.require(:coach).permit(:name, 
-                                    :female, 
-                                    :language_en, 
-                                    :language_de, 
-                                    :notifications,
-                                    user_attributes: [:email,:password])
-    end
-  
+  def coach_params
+    params.require(:coach).permit(:name,
+                                  :female,
+                                  :language_en,
+                                  :language_de,
+                                  :notifications,
+                                  user_attributes: [:email,:password])
+  end
+
+  def find_coach
+    Coach.find(params[:id])
+  end
+
 end
\ No newline at end of file
diff --git a/app/views/coaches/edit.html.erb b/app/views/coaches/edit.html.erb
new file mode 100644
index 00000000..21ef622e
--- /dev/null
+++ b/app/views/coaches/edit.html.erb
@@ -0,0 +1,8 @@
+<h1>Your coach account</h1>
+<%= link_to("View Public Profile", coach_path(@coach)) %>
+<%= form_for(@coach, html: {class: "grey"}, method: :put) do |f| %>
+  <%= render 'shared/coachform', :f => f %>
+  <div class='button'>
+    <%= f.submit "Submit", class: 'commit', type: 'submit' %>
+  </div>
+<% end %>
diff --git a/app/views/coaches/show.html.erb b/app/views/coaches/show.html.erb
index d4e6ef2e..31b2ee1e 100644
--- a/app/views/coaches/show.html.erb
+++ b/app/views/coaches/show.html.erb
@@ -1,4 +1,15 @@
-<h1>Your coach account</h1>  
-<%= form_for @coach, html: {class: "grey"} do |f| %>
-  <%= render 'shared/coachform', :f => f %>
-<% end %>
\ No newline at end of file
+<h1>Coach <%= @coach.name %></h1>
+<table>
+  <tr>
+    <td>Female</td>
+    <td><%= @coach.female %></td>
+  </tr>
+  <tr>
+    <td>gives talks in German</td>
+    <td><%= @coach.language_de %></td>
+  </tr>
+  <tr>
+    <td>gives talks in English</td>
+    <td><%= @coach.language_en %></td>
+  </tr>
+</table>
\ No newline at end of file
diff --git a/app/views/layouts/coach.html.erb b/app/views/layouts/coach.html.erb
index 6040ecb4..0c7d8208 100644
--- a/app/views/layouts/coach.html.erb
+++ b/app/views/layouts/coach.html.erb
@@ -2,16 +2,18 @@
   <nav class="top-menu">
     <ul>
       <li style="float:right"><%= link_to "Sign out", sign_out_path, method: :delete %></li>
-      <li style="float:right"><%= link_to_active "Profile", coach_path(@coach) %></li>
-      <li> Logged in as <%= @coach.user.email %> </li>
+      <li style="float:right"><%= link_to_active "Profile", edit_coach_path(current_user.coach) %></li>
+      <li style="float:right"><%= link_to_active "Events", events_coaches_path %></li>
+      <li> Logged in as <%= current_user.email %> </li>
     </ul>
   </nav>
   <%= yield %>
   <footer>
     <ul>
       <li style="float:right"><%= link_to "Sign out", sign_out_path, method: :delete %></li>
-      <li style="float:right"><%= link_to_active "Profile", coach_path(@coach) %></li>
-      <li> Logged in as <%= @coach.user.email %> </li>
+      <li style="float:right"><%= link_to_active "Profile", edit_coach_path(current_user.coach) %></li>
+      <li style="float:right"><%= link_to_active "Events", events_coaches_path %></li>
+      <li> Logged in as <%= current_user.email %> </li>
     </ul>
   </footer>
 <% end %>
\ No newline at end of file