diff --git a/amadeus/settings.py b/amadeus/settings.py
index b18cffe..f169c68 100644
--- a/amadeus/settings.py
+++ b/amadeus/settings.py
@@ -79,6 +79,7 @@ TEMPLATES = [
                 'django.contrib.messages.context_processors.messages',
 
                 'core.context_processors.notifications',
+                'courses.context_processors.courses',
             ],
         },
     },
@@ -94,8 +95,8 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
         'NAME': 'amadeus',
-        'USER': 'postgres',
-        'PASSWORD': 'felipe',
+        'USER': 'amadeus_admin',
+        'PASSWORD': 'amadeus',
         'HOST': '127.0.0.1',
         'PORT': '5432',
     }
diff --git a/app/templates/home.html b/app/templates/home.html
index d3381b9..41c0ef0 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -86,14 +86,24 @@
             	<li> <a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
                 <li> <a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
                 <li> <a href="#">{% trans 'Pending Tasks' %}</a></li>
-                {% if user|has_role:'student' %}
+                {% if user|has_role:'student' and not user.is_staff %}
                 	<li> <a href="#">{% 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, professor' %}
-            		<li> <a href="{% url 'course:manage' %}">{% trans 'Manage Courses' %}</a></li>
+            		<li> 
+            			<a href="#courses_list" data-toggle="collapse">{% trans 'Manage Courses' %}</a>
+
+						<div id="courses_list" class="collapse">
+							<ul class="nav nav-pill nav-stacked">
+								{% for course in courses_list %}
+									<li><a href="{% url 'course:view' course.slug %}">{{ course }}</a></li>
+								{% endfor %}
+							</ul>
+						</div>
+					</li>
             	{% endif %}
           	</ul>
     	</div>
diff --git a/courses/context_processors.py b/courses/context_processors.py
new file mode 100644
index 0000000..921c3cf
--- /dev/null
+++ b/courses/context_processors.py
@@ -0,0 +1,14 @@
+from .models import Course
+
+def courses(request):
+	if request.user.is_authenticated:
+		context = {}
+
+		if request.user.is_staff:
+			context['courses_list'] = Course.objects.all()
+		else:
+			context['courses_list'] = Course.objects.filter(professors__in = [request.user])
+
+		return context
+	else:
+		return request
\ No newline at end of file
--
libgit2 0.21.2