diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css
index 376c9df..a50b78c 100755
--- a/amadeus/static/css/base/amadeus.css
+++ b/amadeus/static/css/base/amadeus.css
@@ -60,31 +60,51 @@
 /* category app starts */
 
 .panel-invisible{
-  background-color: #BDBDBD;
+    background-color: #BDBDBD;
+}
+
+.category-panel {
+    background: #0277BD;
+}
+.category-panel > .panel-heading, .subject-panel > .panel-heading, .special-panel > .panel-heading {
+    padding: 2px 0px;
+}
+
+.subject-panel {
+    background: #039BE5;
+}
+
+.subject-group {
+    margin-left: 20px;    
 }
 
 .category-header > h4{
-  float:left;
-  margin-top: 0.5%;
+    float:left;
+    margin-top: 5px;
+    margin-bottom: 2px;
 }
 
+.category-header > h4 > a:focus {
+    text-decoration: none;
+}
 
+.category-card-items {
+    padding-right: 0px;
+}
 .category-card-items i{
   font-size: 25px !important;
-  margin-right: 5%;
-  margin-top: 1%;
+  margin-right: 10px;
+  margin-top: 6px;
 }
+
 .category-header i{
     color: white;
-   
     font-size: 20px;
     float: right;
-
-
 }
 
 .category-header i:hover{
-  color: #90CAF9;
+    color: #90CAF9;
 }
 
 
@@ -94,6 +114,7 @@
 
 .cat-selector {
     margin: 0;
+    top: -2px;
 }
 
 #create-category{
@@ -118,8 +139,8 @@
 
 #core-subjects-options-div{
     width: 100%;
-    margin-bottom: 2%;
-    height: 30px;
+    margin-bottom: 10px;
+    height: 50px;
 }
 
 .core-subjects-options  li{
diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index 659b2c3..25e6857 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -70,7 +70,7 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="{% url 'categories:index' %}">
+                <a class="navbar-brand" href="{% url 'subjects:home' %}">
                     <img class="logo pull-left" src="{% static 'img/topo-amadeus-white.png'  %}" alt="Logo" />
                     <span class="pull-right project_name">Projeto Amadeus</span>
                 </a>
diff --git a/categories/templates/categories/list.html b/categories/templates/categories/list.html
index 2b1e83e..2b0d8d7 100755
--- a/categories/templates/categories/list.html
+++ b/categories/templates/categories/list.html
@@ -39,7 +39,7 @@
         <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
             {% for category in categories  %}
                 {% if category.visible %}
-                    <div class="panel panel-info">
+                    <div class="panel panel-info category-panel">
                         <div class="panel-heading">
                             <div class="row">
                                 <div class="col-md-12 category-header">
@@ -48,27 +48,20 @@
                                             <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 %}
                                     
                                     <div class="col-md-5 pull-right category-card-items">
+                                        {% if user.is_staff or user in category.coordinators.all %}
+                                            <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 
+                                                <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+                                            </a>
+                                            <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>
+                                        {% endif %}
                                         <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>
@@ -95,7 +88,7 @@
                                 <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a>
                             {% endif %}
 
-                            <div class="panel-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
+                            <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
                                 {% for subject in category.subject_category.all  %}
                                     {% include "subjects/subject_card.html" %}
                                 {% endfor %}
@@ -103,7 +96,7 @@
                         </div>
                     </div>
                 {% elif request.user in category.coordinators.all or request.user.is_staff %}
-                    <div class="panel panel-invisible">
+                    <div class="panel panel-invisible special-panel">
                         <div class="panel-heading">
                             <div class="row">
                                 <div class="col-md-12 category-header">
@@ -112,33 +105,25 @@
                                             <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 %}
-                                    
-                                        <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 class="col-md-5 pull-right category-card-items">
+                                        {% if user.is_staff or user in category.coordinators.all %}
+                                            <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 
+                                                <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+                                            </a>
+                                            <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>
+                                        {% endif %}
+                                        <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>
@@ -160,7 +145,7 @@
                                 <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a>
                             {% endif %}
                             
-                            <div class="panel-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
+                            <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
                                 {% for subject in category.subject_category.all  %}
                                     {% include "subjects/subject_card.html" %}
                                 {% endfor %}
diff --git a/subjects/templates/subjects/list.html b/subjects/templates/subjects/list.html
index 6293699..5b81a91 100644
--- a/subjects/templates/subjects/list.html
+++ b/subjects/templates/subjects/list.html
@@ -42,7 +42,7 @@
         <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
             {% for category in categories  %}
                 {% if category.visible %}
-                    <div class="panel panel-info">
+                    <div class="panel panel-info category-panel">
                         <div class="panel-heading">
                             <div class="row">
                                 <div class="col-md-12 category-header">
@@ -51,27 +51,20 @@
                                             <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 %}
                                     
                                     <div class="col-md-5 pull-right category-card-items">
+                                        {% if user.is_staff or user in category.coordinators.all %}
+                                            <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 
+                                                <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+                                            </a>
+                                            <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>
+                                        {% endif %}
                                         <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>
@@ -97,7 +90,7 @@
                                 <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a>
                             {% endif %}
                             
-                            <div class="panel-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
+                            <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
                                 {% for subject in category.subject_category.all  %}
                                     {% include "subjects/subject_card.html" %}
                                 {% endfor %}
@@ -105,7 +98,7 @@
                         </div>
                     </div>
                 {% elif request.user in category.coordinators.all %}
-                    <div class="panel panel-danger">
+                    <div class="panel panel-danger special-panel">
                         <div class="panel-heading">
                             <div class="row">
                                 <div class="col-md-12 category-header">
@@ -114,27 +107,20 @@
                                             <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 %}
                                     
                                     <div class="col-md-5 pull-right category-card-items">
+                                         {% if user.is_staff or user in category.coordinators.all %}
+                                            <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 
+                                                <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+                                            </a>
+                                            <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>
+                                        {% endif %}
                                         <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>
@@ -160,7 +146,7 @@
                                 <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a>
                             {% endif %}
 
-                            <div class="panel-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
+                            <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
                                 {% for subject in category.subject_category.all  %}
                                     {% include "subjects/subject_card.html" %}
                                 {% endfor %}
diff --git a/subjects/templates/subjects/subject_card.html b/subjects/templates/subjects/subject_card.html
index ed61e63..dd237fe 100644
--- a/subjects/templates/subjects/subject_card.html
+++ b/subjects/templates/subjects/subject_card.html
@@ -1,6 +1,6 @@
 {% load static i18n permission_tags %}
 
-<div class="panel panel-info">
+<div class="panel panel-info subject-panel">
     <div class="panel-heading">
         <div class="row">
             <div class="col-md-12 category-header">
@@ -9,21 +9,18 @@
                         <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>
-                {% if request.user in subject.professor.all or request.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">
-                                <li><a href="#"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
-                                <li><a href="#"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
-                                <li><a href="#"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                {% endif %}
+
                 <div class="col-md-5 pull-right category-card-items">
+                    {% if request.user in subject.professor.all or request.user in category.coordinators.all  %}
+                        <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 
+                            <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+                        </a>
+                        <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
+                            <li><a href="#"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
+                            <li><a href="#"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
+                            <li><a href="#"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
+                        </ul>
+                    {% endif %}
                     <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>
--
libgit2 0.21.2