diff --git a/core/templates/base.html b/core/templates/base.html
index 3c55448..faf5d86 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -47,71 +47,54 @@
 	{% endblock %}
 </head>
 <body>
+	{% block nav %}
+   	<div class="navbar navbar-default">
+         		<div class="navbar-header">
+           		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+             			<span class="icon-bar"></span>
+             			<span class="icon-bar"></span>
+             			<span class="icon-bar"></span>
+           		</button>
+           		<a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus-white.png'  %}" alt="Logo"/></a>
+         		</div>
+         		<div class="navbar-collapse collapse navbar-responsive-collapse">
+           		<ul class="nav navbar-nav navbar-right notifications">
+             			 <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
+                 <a  class="dropdown-toggle" data-toggle="dropdown"> <span id="notification-count" class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>
+                   <ul id="notification-dropdown" class="dropdown-menu">
+                   <li class="dropdown-header">Notifications</li>
+                   		{% include "notifications.html" %}
+
+                   		<li>
+                   		 <a onclick="getNotifications(5)">
+                   			<div id="notification-see-more" class="list-group-item">
+                                  <div class="row-content">
+                                    <p class="list-group-item-text">See More</p>
+                                </div>
+                       </a>
+                   		</li>
+                    </ul>
+               </li>
+
+             			<li  data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
+             			<li > <a  class="link" href="{% url 'users:profile' %}">{{ user }}</a></li>
+             			<li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out"> <a href="{% url 'core:logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a></li>
+           		</ul>
+         		</div>
+   	</div>
+	{% endblock %}
 	<div class="container-fluid">
-		{% block nav %}
-			<div class="row">
-			        	<div class="navbar navbar-default">
-			              		<div class="navbar-header">
-			                		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
-			                  			<span class="icon-bar"></span>
-			                  			<span class="icon-bar"></span>
-			                  			<span class="icon-bar"></span>
-			                		</button>
-			                		<a class="navbar-brand" href="{% url 'app:index' %}"><img class="logo" src="{% static 'img/topo-amadeus-white.png'  %}" alt="Logo"/></a>
-			              		</div>
-			              		<div class="navbar-collapse collapse navbar-responsive-collapse">
-			                		<ul class="nav navbar-nav navbar-right notifications">
-			                  			 <li class="" data-toggle="tooltip" data-placement="bottom" title data-original-title="notifications">
-						                   <a  class="dropdown-toggle" data-toggle="dropdown"> <span id="notification-count" class="badge notification-count">{{notifications.count}}</span><i class="fa fa-bell" aria-hidden="true"></i></a>
-						                     <ul id="notification-dropdown" class="dropdown-menu">
-						                     <li class="dropdown-header">Notifications</li>
-						                     		{% include "notifications.html" %}
-
-						                     		<li>
-						                     		 <a onclick="getNotifications(5)">
-						                     			<div id="notification-see-more" class="list-group-item">
-								                                  <div class="row-content">
-								                                    <p class="list-group-item-text">See More</p>
-								                                </div>
-								                       </a>
-						                     		</li>
-						                      </ul>
-						                 </li>
-
-			                  			<li  data-toggle="tooltip" data-placement="bottom" title data-original-title="{% trans 'messages' %}"> <a href="#"><i class="fa fa-comments" aria-hidden="true"></i></a> </li>
-			                  			<li > <a  class="link" href="{% url 'users:profile' %}">{{ user }}</a></li>
-			                  			<li data-toggle="tooltip" data-placement="bottom" title data-original-title="log out"> <a href="{% url 'core:logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i></a></li>
-			                		</ul>
-			              		</div>
-			        	</div>
-			</div>
-		{% endblock %}
-
 		<div class="row">
-		    		<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
-						{% block sidebar %}
-
-						{% endblock %}
-		    		</div>
-
-		    		<div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
-				    	{% block breadcrumbs %}
-
-				    	{% endblock %}
-
-				    	{% block render_breadcrumbs %}
-
-				    	{% endblock %}
-							<div class="row">
-								<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
-								{% block content %}
-
-								{% endblock %}
-			    				</div>
-
-
-							</div>
-				    </div>
+    		<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
+    			{% block sidebar %}{% endblock %}
+    		</div>
+		   <div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
+				{% block breadcrumbs %}{% endblock %}
+				{% block render_breadcrumbs %}{% endblock %}
+			</div>
+			<div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 col-xl-10">
+				{% block content %}{% endblock %}
+			</div>
 		</div>
 	</div>
 	<script src="{% static 'js/main.js' %}"></script>
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index de69751..986c0cf 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -11,47 +11,35 @@
 {% endblock %}
 
 {% block sidebar %}
-<div class="panel panel-primary navigation">
-    <div class="panel-heading">
-        <h4>{% trans 'Menu' %}</h4>
-    </div>
-    <div class="panel-body">
-        <ul class="nav nav-pills nav-stacked">
-        	<li><a href="{% url 'core:home' %}">{% trans 'Home' %}</a></li>
-            <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-            <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-        </ul>
-    </div>
-</div>
-
-{% if user|has_role:'professor' or user|has_role:'system_admin' %}
-
     <div class="panel panel-primary navigation">
-	    <div class="panel-heading">
-	        <h3 class="panel-title">Actions</h3>
-	    </div>
-	    <div class="panel-body">
-	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="javascript:void(0)">Replicate Course</a></li>
-	            <li><a href="{% url 'course:create' %}">Create Course</a></li>
-	        </ul>
-	    </div>
-	</div>
-
-	<div class="panel panel-primary navigation">
-	    <div class="panel-heading">
-	        <h3 class="panel-title">Category</h3>
-	    </div>
-	    <div class="panel-body">
-	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
-	            <li><a href="{% url 'course:manage_cat' %}">List Category</a></li>
-	        </ul>
-	    </div>
-	</div>
-
-{% endif %}
-
+        <div class="panel-heading">
+            <h4>Menu</h4>
+        </div>
+        <div class="panel-body">
+            <ul class="nav nav-pills nav-stacked">
+                <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
+                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
+                {% if user|has_role:'student' or not user.is_staff %}
+                    <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
+                {% endif %}
+                {% if user|has_role:'system_admin' %}
+                    <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
+                {% endif %}
+                {% if user|has_role:'system_admin' or user|has_role:'professor' %}
+                    <li>
+                        <a href="#courses_list" class="accordion" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
+                        <div id="courses_list" class="collapse">
+                            <ul class="nav nav-pill nav-stacked accordion_list">
+                            {% for course in courses_list %}
+                                <li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
+                            {% endfor %}
+                            </ul>
+                        </div>
+                    </li>
+                {% endif %}
+            </ul>
+        </div>
+    </div>
 {% endblock %}
 
 {% block content %}
--
libgit2 0.21.2