diff --git a/courses/templates/category/create.html b/courses/templates/category/create.html
index 728c373..55dc56a 100644
--- a/courses/templates/category/create.html
+++ b/courses/templates/category/create.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'home.html' %}
 
 {% load static i18n permission_tags %}
 {% load widget_tweaks %}
@@ -11,17 +11,7 @@
 {% endblock %}
 
 {% block sidebar %}
-	<div class="panel panel-primary navigation">
-        <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-            </ul>
-        </div>
-    </div>
+{{block.super}}
 
 {% if user|has_role:'professor' or user|has_role:'system_admin' %}
 
diff --git a/courses/templates/category/index.html b/courses/templates/category/index.html
index 361c188..a92ab7b 100644
--- a/courses/templates/category/index.html
+++ b/courses/templates/category/index.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'home.html' %}
 
 {% load static i18n %}
 {% load static i18n permission_tags %}
@@ -12,17 +12,7 @@
 {% endblock %}
 
 {% block sidebar %}
-	<div class="panel panel-primary navigation">
-        <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-            </ul>
-        </div>
-    </div>
+{{block.super}}
 
 	{% if user|has_role:'professor' or user|has_role:'system_admin' %}
 
@@ -83,7 +73,7 @@
 						              </ul>
 						            </div>
 						        </div>
-					        
+
 					      </div>
 					    </div>
 					</div>
diff --git a/courses/templates/category/update.html b/courses/templates/category/update.html
index 7e0b47c..17da193 100644
--- a/courses/templates/category/update.html
+++ b/courses/templates/category/update.html
@@ -1,4 +1,4 @@
-{% extends 'base.html' %}
+{% extends 'Home.html' %}
 
 {% load static i18n %}
 {% load static i18n permission_tags %}
@@ -12,17 +12,7 @@
 {% endblock %}
 
 {% block sidebar %}
-	<div class="panel panel-primary navigation">
-        <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-            </ul>
-        </div>
-    </div>
+{{block.super}}
 
 {% if user|has_role:'professor' or user|has_role:'system_admin' %}
 
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index 5516ded..37ceb98 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -1,4 +1,4 @@
-{% extends 'home_professor.html' %}
+{% extends 'home.html' %}
 
 {% load static i18n permission_tags %}
 {% load django_bootstrap_breadcrumbs %}
@@ -11,35 +11,7 @@
 {% endblock %}
 
 {% block sidebar %}
-    <div class="panel panel-primary">
-        <div class="panel-heading">
-            <h4>{% trans 'Menu' %}</h4>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-                {% if user|has_role:'student' or not user.is_staff %}
-                    <li><a href="{% url 'course:manage' %}">{% trans 'My courses' %}</a></li>
-                    <li><a href="{% url 'course:all_courses' %}">{% trans 'All Courses' %}</a></li>
-                {% endif %}
-                <li><a href="{% url 'core:guest' %}">{% trans 'Courses' %}</a></li>
-                {% 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>
+{{block.super}}
         {% if user|has_role:'professor' or user|has_role:'system_admin' %}
             <div class="panel panel-primary">
                 <div class="panel-heading">
--
libgit2 0.21.2