diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index 0f53ed3..783ea37 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -53,10 +53,20 @@
 		{% endfor %}
 	{% endif %}
 
+<div class="col-md-12">
+		<div class="input-group">
+		  <div class="form-group is-empty"><input type="search" class="form-control" placeholder="Search Courses"></div>
+		    <span class="input-group-btn input-group-sm">
+		      <button type="button" class="btn btn-fab btn-fab-mini">
+		        <i class="material-icons">search</i>
+		      </button>
+		    </span>
+		</div>
+	</div>
 {% if user|has_role:'professor, system_admin' %}
 
 	<div class="col-md-12">
-		{% if courses_teacher|length > 0 %}
+		{% if courses|length > 0 %}
 			{% for course in courses_teacher %}
 			  <!-- Put your content here! -->
 	          <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false">
@@ -130,21 +140,11 @@
 				</div>
 			</div>
 		</div>
+{% endif %}
 
-{% else %}
+{% if user|has_role:'students' %}
 
-	<div class="col-md-12">
-		<div class="input-group">
-		  <div class="form-group is-empty"><input type="search" class="form-control" placeholder="Search Courses"></div>
-		    <span class="input-group-btn input-group-sm">
-		      <button type="button" class="btn btn-fab btn-fab-mini">
-		        <i class="material-icons">search</i>
-		      </button>
-		    </span>
-		</div>
-	</div>
-
-	{% if subjects_student|length > 0 %}
+	{% if courses|length > 0 %}
 		{% for course in courses_student %}
 			<div class="col-md-12">
 			    <div class="panel panel-info">
@@ -154,9 +154,15 @@
 	            	<img src="" class="img-responsive" />
 	            {% endif %} -->
 				  <div class="panel-heading">
-				    	<h3 class="panel-title">Course</h3>
-				    	<span class="label label-info">{{ course.category }}</span>
-							<span class="label label-warning">{{ course.max_students }} {% trans 'students tops' %}</span>  
+					  <div class="row">
+					  	<div class="col-md-9">
+				  			<h3 class="panel-title">{{course.name}}</h3>
+				  		</div>
+				  		<div class="col-md-3">
+				  			<span class="label label-info">{{ course.category }}</span>
+							<span class="label label-warning">{{ course.max_students }} {% trans 'students tops' %}</span>
+				  		</div>
+					  </div>
 				  </div>     
 				  <div class="panel-body">
 				    <p><b>Course Name: </b>{{ course.name }}</p>
@@ -165,18 +171,22 @@
 				    <p>
 				      <b>Description:</b>
 				      <i>
-				        "Lorem ipsum dolor sit amet, consecctetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+				      {% if couse.description %}
+				        {{course.description|linebreaks}}
+				      {% else %}
+				      	{% trans 'No description' %}
+				      {% endif %}
 				      </i>
 				    </p>
 
-				    {% if user|has_role:'professor, system_admin' %}
+				    <!--{% if user|has_role:'professor, system_admin' %}
 						<a href="{% url 'course:update' course.slug %}" class="btn btn-sm btn-primary">
 							<span class="glyphicon glyphicon-edit"></span>
 						</a>
 						<a href="{% url 'course:delete' course.slug %}" class="btn btn-sm btn-danger">
 							<span class="glyphicon glyphicon-trash"></span>
 						</a>
-					{% endif %}
+					{% endif %}-->
 
 				    <a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">View Course</a>
 				  </div>
@@ -185,7 +195,6 @@
 
     	{% endfor %}
 
-
     	<nav aria-label="Page navigation">
   			<ul class="pagination">
     			{% for page_number in paginator.page_range %}
@@ -199,4 +208,5 @@
 		{% trans 'No courses found' %}
 	{% endif %}
 {% endif %}
+
 {% endblock %}
diff --git a/courses/templates/course/view.html b/courses/templates/course/view.html
index ab9d59d..aa30faf 100644
--- a/courses/templates/course/view.html
+++ b/courses/templates/course/view.html
@@ -99,7 +99,7 @@
       </div>
       <div class="modal-body">
         <div>
-          <form class="form-horizontal">
+          <!--<form class="form-horizontal">
             <div class="form-group is-empty">
               <label class="control-label col-md-2 col-md-offset-1 col-xs-2 col-xs-offset-1">Name</label>
               <div class="col-md-8 col-xs-8">
@@ -148,7 +148,7 @@
                 </div>
               </div>
             </div>
-          </form>
+          </form>-->
         </div>
         <div class="modal-footer">
           <button type="button" data-dismiss="modal" class="btn btn-default">Cancel</button>
@@ -233,6 +233,10 @@
         <a href="{% url 'course:view_subject' subject.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Subject' %}<div class="ripple-container"></div></a>
     </div>
 </div>
+<div class="form-group">
+  <a href="{% url 'course:create_subject' subject.slug %}" data-toggle="modal" data-target="" class="btn btn-primary btn-lg btn-block btn-raised">{% trans 'Create Subject' %}<div class="ripple-container"></div></a>
+</div>
+
 {% endfor %}
 
 
diff --git a/courses/templates/subject/index.html b/courses/templates/subject/index.html
index 9bcea4b..91f9a38 100644
--- a/courses/templates/subject/index.html
+++ b/courses/templates/subject/index.html
@@ -67,7 +67,9 @@
 	{% endfor %}
 
 	{% if user|has_role:'system_admin' or topic.owner == user%}
-		<a name="create_topic" class="btn btn-primary btn-md btn-block" href="{% url 'course:create_topic' subject.slug %}">{% trans "Create Topic" %}</a>
+		<div class="form-group">
+            <a href="{% url 'course:create_topic' subject.slug %}" data-toggle="modal" data-target="" class="btn btn-primary btn-lg btn-block btn-raised" name="create_topic">{% trans "Create Topic" %}<div class="ripple-container"></div></a>
+          </div>
 	{% endif %}	
 
 {% endblock %}
--
libgit2 0.21.2