diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css
index 70b5e62..19fe555 100755
--- a/amadeus/static/css/base/amadeus.css
+++ b/amadeus/static/css/base/amadeus.css
@@ -4,12 +4,12 @@
 #sidebar-menu{
   margin-left: 30%;
 }
-#sidebar-menu > .item{
+#sidebar-menu .item{
     font-size: 45px;
     background-color: #26A69A;
     color: white;
     width: 80%;
-    margin: 10px;
+    margin: 10px 0px 10px 10px;
     text-align: center;
 }
 
@@ -19,6 +19,14 @@
    
 }
 
+#subjects-link{
+  margin-top: 0px !important;
+}
+
+#sidebar-menu-div{
+  padding-right: 10px;
+}
+
 
 
 /* side bar menu ends*/
diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index ac1452f..ddf7d9f 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -139,12 +139,12 @@
     {% endblock %}
     <div class="container-fluid">
         <div class="row">
-            <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
+            <div id="sidebar-menu-div" class="col-xs-2 col-sm-2 col-md-2 col-lg-2 col-xl-2">
                 {% block sidebar %}
                    <ul id="sidebar-menu">
-                       <li class="item"  data-toggle="tooltip" data-placement="right" title="{% trans "Subjects" %}">
+                        <a href="{% url 'subjects:index' %}"><li class="item" id="subjects-link" data-toggle="tooltip" data-placement="right" title="{% trans "Subjects" %}">
                             <i class="fa fa-graduation-cap" aria-hidden="true"></i>
-                       </li>
+                       </li></a>
                        <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Timeline" %}">
                             <i class="fa fa-list" aria-hidden="true" ></i>
                        </li>
diff --git a/amadeus/urls.py b/amadeus/urls.py
index 47add98..f288b09 100644
--- a/amadeus/urls.py
+++ b/amadeus/urls.py
@@ -26,6 +26,7 @@ urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'^$', index, name = 'home'),
     url(r'^categories/', include('categories.urls', namespace = 'categories')),
+    url(r'^subjects/', include('subjects.urls', namespace='subjects')),
     #API
     url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
     #S3Direct
diff --git a/amadeus/views.py b/amadeus/views.py
index 3e5adc9..e312576 100644
--- a/amadeus/views.py
+++ b/amadeus/views.py
@@ -1,8 +1,9 @@
 from django.http import Http404
 from django.shortcuts import redirect
+from django.urls import reverse_lazy
 
 def index(request):
 	if request.user.is_authenticated:
-		return redirect('categories:index')
+		return redirect(reverse_lazy("subjects:index"))
 	else:
 		return redirect('users:login')
\ No newline at end of file
diff --git a/categories/views.py b/categories/views.py
index 984f67a..9ef3ba5 100644
--- a/categories/views.py
+++ b/categories/views.py
@@ -24,7 +24,7 @@ import time
 
 from users.models import User
 
-class IndexView(LoginRequiredMixin, ListView):
+class IndexView(views.SuperuserRequiredMixin, LoginRequiredMixin, ListView):
 
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html
new file mode 100644
index 0000000..6de1a05
--- /dev/null
+++ b/subjects/templates/subjects/list.html
@@ -0,0 +1,104 @@
+{% extends 'categories/home.html' %}
+
+{% load static i18n permission_tags %}
+{% load django_bootstrap_breadcrumbs %}
+
+{% block javascript%}
+    {{ block.super }}
+{% endblock%}
+
+{% block breadcrumbs %}
+    {{ block.super }}
+    {% breadcrumb   "Subjects" 'categories:index' %}
+{% endblock %}
+
+{% block content %}
+    {% if messages %}
+        {% for message in messages %}
+            <script type="text/javascript">
+                alertify.success('{{message}}');
+            </script>
+        {% endfor %}
+    {% endif %}    
+    <div id="core-subjects-options-div">
+        <ul class="core-subjects-options">
+            <li class="active">{% trans "My subjects" %}</li>
+            <li>{% trans "all subjects" %}</li>
+        </ul>
+    </div>
+
+    <!-- Code for listing categories -->
+    <div class="col-md-12 cards-content">
+        <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+            {% for category in categories  %}
+                <div class="panel panel-info">
+                    <div class="panel-heading">
+                        <div class="row">
+                            <div class="col-md-12 category-header">
+                                <h4 class="panel-title">
+                                    <a class="category-course-link pull-left" data-parent="#accordion" data-toggle="collapse" href="#{{category.slug}}">
+                                        <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{category.name}}
+                                    </a>
+                                </h4>
+                                {% if user.is_staff or user in category.coordinators.all %}
+                                    <div class=" divMoreActions">
+                                        <div class="btn-group">
+                                            <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
+                                            </button>
+                                            <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
+                                                {% if user.is_staff %}
+                                                    <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
+                                                {% endif %}
+                                                <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
+                                                <li><a href="javascript:delete_course.get('{% url 'categories:delete' category.slug %}?view=index','#category','#modal_course')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
+                                            </ul>
+                                        </div>
+                                    </div>
+                                {% else %}
+                                    <div class=" divMoreActions">
+                                    </div>
+                                {% endif %}
+                                {% if not user.is_staff  %}
+                                    <div class="col-md-5 pull-right category-card-items">
+                                        <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
+                                        <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
+                                        <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>
+                                        <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
+                                    </div>
+                                {% endif %}
+                            </div>
+                        </div>
+                    </div>
+                    <div id="{{category.slug}}" class="panel-collapse collapse category-panel-content">
+                        <input type="hidden" class="log_url" value="{% url 'categories:view_log' category.id %}" />
+                        <input type="hidden" class="log_id" value="" />
+
+                        <h4>  {% trans "Coordinator(s): " %}
+                            {% for coordinator in category.coordinators.all %}
+                                {{coordinator.username}}
+                            {% endfor %}
+                        </h4>
+                        {{category.description|safe}}
+                         {% if user in category.coordinators.all %}
+                        <button class="create-subject-btn"> {% trans "create new subject" %} </button>
+                    {% endif %}
+
+                    </div>
+                    
+                   
+                    {% comment %}
+                        <div id="{{category.slug}}" class="panel-collapse collapse">
+                            {% for subject in subjects %}
+                                {% include "categories/category_card.html" %}
+                            {% endfor %}
+                        </div>
+                    {% endcomment %}
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+    <div id="modal_course">
+    </div>
+    <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
+{% endblock %}
diff --git a/subjects/urls.py b/subjects/urls.py
new file mode 100644
index 0000000..8969b07
--- /dev/null
+++ b/subjects/urls.py
@@ -0,0 +1,6 @@
+from django.conf.urls import url
+from . import views
+
+urlpatterns = [
+	url(r'^$', views.IndexView.as_view(), name='index'),
+]
\ No newline at end of file
diff --git a/subjects/views.py b/subjects/views.py
index 91ea44a..3143b58 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -1,3 +1,68 @@
-from django.shortcuts import render
 
-# Create your views here.
+from django.shortcuts import render, get_object_or_404
+from django.views.generic import ListView, CreateView, DeleteView, UpdateView
+from categories.models import Category
+from django.core.urlresolvers import reverse_lazy
+from rolepermissions.verifications import has_role
+
+from django.contrib import messages
+from django.http import HttpResponse, JsonResponse
+from django.utils.translation import ugettext_lazy as _
+
+from django.contrib.auth.mixins import LoginRequiredMixin
+
+from rolepermissions.mixins import HasRoleMixin
+from categories.forms import CategoryForm
+
+from braces import views
+from subjects.models import Subject
+
+from log.mixins import LogMixin
+from log.decorators import log_decorator_ajax
+from log.models import Log
+
+import time
+
+from users.models import User
+
+
+class IndexView(LoginRequiredMixin, ListView):
+
+    login_url = reverse_lazy("users:login")
+    redirect_field_name = 'next'
+    queryset = Category.objects.all()
+    template_name = 'subjects/list.html'
+    context_object_name = 'categories'
+
+
+    def get_queryset(self):
+        result = super(IndexView, self).get_queryset()
+
+       	
+        return result
+
+    def render_to_response(self, context, **response_kwargs):
+        if self.request.user.is_staff:
+            context['page_template'] = "categories/home_admin_content.html"
+        else:
+            context['page_template'] = "categories/home_teacher_student.html"
+
+        context['title'] = _('Categories')
+
+        if self.request.is_ajax():
+            if self.request.user.is_staff:
+                self.template_name = "categories/home_admin_content.html"
+            else:
+                self.template_name = "categories/home_teacher_student_content.html"
+
+        return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs)
+
+    def get_context_data(self, **kwargs):
+        context = super(IndexView, self).get_context_data(**kwargs)
+        list_categories = None
+        categories = self.get_queryset().order_by('name')
+        
+        
+        context['categories'] = categories
+
+        return context
--
libgit2 0.21.2