diff --git a/core/static/css/base/amadeus.css b/core/static/css/base/amadeus.css
index a0107d1..1bb5f5e 100644
--- a/core/static/css/base/amadeus.css
+++ b/core/static/css/base/amadeus.css
@@ -418,6 +418,11 @@ ul, li {
 .course, .subject, .topic{ padding-top: 0px; padding-bottom: 0px; }
 .course-detail{padding-top: 10px; padding-bottom: 10px;}
 
+.category-course-link{
+  font-size: 24px;
+  color: black !important;
+}
+
 /* Menu link remove radius */
 .nav-pills > li > a {
   border-radius: 0px;
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index a4f5785..617e8cb 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -110,7 +110,28 @@
 
 </fieldset>
     <div class="col-md-12 cards-content">
-        {% if courses|length > 0 %}
+        {% for category in categorys_courses  %}
+            <div class="panel-group">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h4 class="panel-title">
+                            <a  class="category-course-link" data-toggle="collapse" href="#{{category.slug}}">{{category.name}}</a>
+                        </h4>
+                        
+                    </div>
+                    <div id="{{category.slug}}" class="panel-collapse collapse">
+                        {% for course in category.course_category.all %}
+                            {% if user in course.students.all %}
+                                 {% include "course/course_card.html" %}
+                            {% endif %}
+                        {% endfor %}
+                    </div>
+                </div>
+            </div>
+            
+            
+        {% endfor %}
+        <!--{% if courses|length > 0 %}
             {% if request.GET.category == '' or aparece or request.GET.q == '' %}
                 {% for course in list_courses %}
                     {% include "course/course_card.html" %}
@@ -123,7 +144,7 @@
             {% endif %}
         {% else %}
             {% trans 'No courses found' %}
-        {% endif %}
+        {% endif %}-->
     </div>
         <div class="col-md-12">
         <nav aria-label="Page navigation">
diff --git a/courses/views.py b/courses/views.py
index 7cd9979..142cebd 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -123,8 +123,8 @@ class AllCoursesView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 		list_courses = None
 		categorys_courses = None
 		list_courses = Course.objects.all().order_by('name')
-		categorys_courses = CourseCategory.objects.all().distinct().order_by('name')
-
+		#categorys_courses = CourseCategory.objects.all().distinct().order_by('name')
+		categorys_courses = CourseCategory.objects.all()
 		paginator = Paginator(list_courses, self.paginate_by)
 		page = self.request.GET.get('page')
 
--
libgit2 0.21.2