diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css
index 4862770..cba0e62 100755
--- a/amadeus/static/css/base/amadeus.css
+++ b/amadeus/static/css/base/amadeus.css
@@ -92,17 +92,17 @@
     height: 30px;
 }
 
-.core-subjects-options > li{
+.core-subjects-options  li{
   float:left;
   padding: 10px;
   background-color: #FFFFFF;
   margin: 1px;
  
-    border-bottom: 4px;
+    border-bottom: 10px;
     border-bottom-style: solid;
 }
 
-.core-subjects-options > li.active{
+.core-subjects-options  li.active{
   border-bottom-color: green;
 }
 
diff --git a/categories/views.py b/categories/views.py
index 8ff0f14..429671b 100644
--- a/categories/views.py
+++ b/categories/views.py
@@ -56,10 +56,8 @@ class IndexView(views.SuperuserRequiredMixin, LoginRequiredMixin, ListView):
 
     def get_context_data(self, **kwargs):
         context = super(IndexView, self).get_context_data(**kwargs)
-        list_categories = None
-        categories = self.get_queryset().order_by('name')
-        
         
+        categories = self.get_queryset().order_by('name')
         context['categories'] = categories
 
         return context
diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html
index 61bc520..dc7e9b6 100644
--- a/subjects/templates/subjects/list.html
+++ b/subjects/templates/subjects/list.html
@@ -22,8 +22,14 @@
     {% endif %}    
     <div id="core-subjects-options-div">
         <ul class="core-subjects-options">
-            <li class="active">{% trans "My subjects" %}</li>
-            <li>{% trans "all subjects" %}</li>
+            {% if all %}
+                <a href="{% url 'subjects:index' %}"><li >{% trans "My subjects" %}</li></a>
+                <a href="{% url 'subjects:index' 'all' %}" ><li class="active">{% trans "all subjects" %}</li></a>
+            {% else %}
+                <a href="{% url 'subjects:index' %}"><li class="active">{% trans "My subjects" %}</li></a>
+                <a href="{% url 'subjects:index' 'all' %}" ><li>{% trans "all subjects" %}</li></a>
+            {% endif %}
+            
         </ul>
     </div>
 
@@ -70,10 +76,10 @@
                             </div>
                         </div>
                     </div>
-                    <div id="{{category.slug}}" class="panel-collapse collapse category-panel-content">
+                    <div id="{{category.slug}}" class="panel-collapse panel-body collapse category-panel-content">
                         <input type="hidden" class="log_url" value="{% url 'categories:view_log' category.id %}" />
                         <input type="hidden" class="log_id" value="" />
-                        {% if coordinators %}
+                        {% if category.coordinators.all|length > 0  %}
                              <h4>  {% trans "Coordinator(s): " %}
                             {% for coordinator in category.coordinators.all %}
                                 {{coordinator.social_name}}
@@ -85,12 +91,21 @@
 
                        
                         {{category.description|safe}}
+                        
+                        
+                    
                         {% if user in category.coordinators.all %}
                         <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "create new subject" %} </button></a>
                         {% endif %}
-
+                        <div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true">
+                            {% for subject in category.subjects  %}
+                                {% include "subjects/subject_card.html" %}
+                            {% endfor %}
+                        </div>
+                 
+                       
                     </div>
-                    
+                   
                    
                     {% comment %}
                         <div id="{{category.slug}}" class="panel-collapse collapse">
diff --git a/subjects/templates/subjects/subject_card.html b/subjects/templates/subjects/subject_card.html
new file mode 100644
index 0000000..fc130c9
--- /dev/null
+++ b/subjects/templates/subjects/subject_card.html
@@ -0,0 +1,34 @@
+{% load static i18n permission_tags %}
+ <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="#subject-accordion" data-toggle="collapse" href="#{{subject.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> {{subject.name}}
+                            </a>
+                        </h4>
+                       
+                            <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>
+                       
+                    </div>
+                </div>
+        </div>
+
+ <div id="{{subject.slug}}" class="panel-collapse collapse category-panel-content">
+        <p>{{subject.init_date}}</p>
+        <p>{{subject.end_date}}</p>
+       
+        <p>{{subject.description_brief|safe}}</p>
+
+                      
+
+
+</div>
+
+</div>
\ No newline at end of file
diff --git a/subjects/urls.py b/subjects/urls.py
index e2b240e..403c033 100644
--- a/subjects/urls.py
+++ b/subjects/urls.py
@@ -3,5 +3,6 @@ from . import views
 
 urlpatterns = [
 	url(r'^$', views.IndexView.as_view(), name='index'),
+	url(r'^(?P<option>[\w_-]+)/$', views.IndexView.as_view(), name='index'),
 	url(r'^create/(?P<slug>[\w_-]+)/$', views.SubjectCreateView.as_view(), name='create'),
 ]
\ No newline at end of file
diff --git a/subjects/views.py b/subjects/views.py
index fea7c95..d509726 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -61,11 +61,24 @@ class IndexView(LoginRequiredMixin, ListView):
         if self.request.user.is_staff:
              categories = self.get_queryset().order_by('name')
         else:
-            categories = self.get_queryset().order_by('name').filter(visible=True)
+            if self.kwargs.get('option'):
+                categories = self.get_queryset().order_by('name').filter(visible=True)
+                context['all'] = True
+                for category in categories:
+                    category.subjects = Subject.objects.all().filter(category= category)
+            else:
+                context['all'] = False
+                categories = self.get_queryset().filter(visible=True)
+                for category in categories:
+                    category.subjects = Subject.objects.all().filter(category= category)
+
+                categories = [category for category in categories if category.subjects.count() > 0 and self.request.user in category.coordinators.all()] 
+                #So I remove all categories that doesn't have the possibility for the user to be on
+               
         
+        #print(categories[1].subject_set)
         #Settings subjects for template use
-        for category in categories:
-            category.subjects = Subject.objects.all().filter(category= category)
+       
            
         
         context['categories'] = categories
--
libgit2 0.21.2