diff --git a/courses/templates/category/delete.html b/courses/templates/category/delete.html
index 81e4af4..40363bc 100644
--- a/courses/templates/category/delete.html
+++ b/courses/templates/category/delete.html
@@ -1,64 +1,36 @@
-{% extends 'base.html' %}
-
-{% load static i18n %}
 {% load static i18n permission_tags %}
 
-{% block breadcrumbs %}
-	<ol class="breadcrumb">
-	  	<li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
-	  	<li class="active">{% trans 'Manage Categories' %}</li>
-	</ol>
-{% endblock %}
+<!-- Modal (remember to change the ids!!!) -->
+<div class="modal fade" id="category" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <!-- Modal Header -->
+      <div class="modal-header">
 
-{% block sidebar %}
-	<div class="panel panel-primary navigation">
-        <div class="panel-heading">
-            <h5>{% trans 'Menu' %}</h5>
-        </div>
-        <div class="panel-body">
-            <ul class="nav nav-pills nav-stacked">
-                <li><a href="{% url 'users:profile' %}">{% trans 'Profile' %}</a></li>
-                <li><a href="{% url 'course:manage' %}">{% trans 'My Courses' %}</a></li>
-            </ul>
-        </div>
+        <h4 class="modal-title" id="myModalLabel">{% trans "Delete Category" %}</h4>
+      </div>
+      <!-- Modal Body -->
+      <div class="modal-body">
+        <!-- Put ONLY your content here!!!  -->
+		<form id="delete_form" action="" method="post">
+		  {% csrf_token %}
+		    <p>{% trans 'Are you sure you want to delete the subject' %} "{{category.name}}"?</p>
+		</form>
+      </div>
+      <!-- Modal Footer -->
+      <div class="modal-footer">
+        <!-- Don't remove that!!!  -->
+        <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+        <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button>
+		<script>
+		  $("#delete_form").submit(function(event) {
+		    Submite.remove("{% url 'course:delete_cat' category.slug %}",$(this).serialize(),"#category_{{category.slug}}");
+		    event.preventDefault();
+		  });
+		</script>
+      </div>
     </div>
-
-{% if user|has_role:'professor' or user|has_role:'system_admin' %}
-
-    <div class="panel panel-primary navigation">
-	    <div class="panel-heading">
-	        <h3 class="panel-title">Actions</h3>
-	    </div>
-	    <div class="panel-body">
-	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="javascript:void(0)">Replicate Course</a></li>
-	            <li><a href="{% url 'course:create' %}">Create Course</a></li>
-	            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
-	        </ul>
-	    </div>
-	</div>
-	<div class="panel panel-primary navigation">
-	    <div class="panel-heading">
-	        <h3 class="panel-title">Category</h3>
-	    </div>
-	    <div class="panel-body">
-	        <ul class="nav nav-pills nav-stacked">
-	            <li><a href="{% url 'course:create_cat' %}">Create Category</a></li>
-	            <li><a href="{% url 'course:manage_cat' %}">List Category</a></li>
-	        </ul>
-	    </div>
-	</div>
-{% endif %}
-{% endblock %}
-
-{% block content %}
-	<div class="card card-content">
-	    <div class="card-body">
-			<form action="" method="post">{% csrf_token %}
-		    	<h1>{% trans 'Are you sure you want to delete the category' %} "{{ object }}"?</h1>
-			    <input type="submit" class="btn btn-success btn-sm" value="{% trans 'Yes' %}" />
-			    <a href="{% url 'course:manage_cat' %}" class="btn btn-danger btn-sm">{% trans 'No' %}</a>
-			</form>
-		</div>
-	</div>
-{% endblock %}
+  </div>
+</div>
+<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script src="{% static 'js/modal_category.js' %}"></script>
diff --git a/courses/templates/category/index.html b/courses/templates/category/index.html
index 24c5e29..b7a8a55 100644
--- a/courses/templates/category/index.html
+++ b/courses/templates/category/index.html
@@ -82,7 +82,8 @@
 							<td class="text-center">
 								<a href="{% url 'course:view_cat' category.slug %}" class="btn btn-info btn-sm"><span class="glyphicon glyphicon-eye-open"></span></a>
 								<a href="{% url 'course:update_cat' category.slug %}" class="btn btn-primary btn-sm"><span class="glyphicon glyphicon-edit"></span></a>
-								<a href="{% url 'course:delete_cat' category.slug %}" class="btn btn-danger btn-sm"><span class="glyphicon glyphicon-trash"></span></a>
+								<a href="javascript:modal.get('{% url 'course:delete_cat' category.slug %}','#category','#modal_category');" class="btn btn-danger btn-sm"><span class="glyphicon glyphicon-trash"></span></a>
+
 							</td>
 						</tr>
 					{% endfor %}
@@ -96,4 +97,6 @@
 			</tbody>
 		</table>
 	</div>
-{% endblock %}
+	<div class="row" id="modal_category">
+<script src="{% static 'js/modal_category.js' %}"></script>
+{% endblock %}
\ No newline at end of file
diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html
index 0d8f4d2..3850a78 100644
--- a/courses/templates/course/index.html
+++ b/courses/templates/course/index.html
@@ -98,13 +98,13 @@
 						<div class="panel panel-info">
 						    <div class="panel-heading" role="tab">
 						      <div class="row">
-						        <div class="col-xs-9 col-md-9 titleTopic">
+						        <div class="col-xs-9 col-md-10 titleTopic">
 						          <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseOne" aria-expanded="false" aria-controls="collapseOne" class="collapsed">
 						          <h4 style="color:white">{{course.name}}</h4>
 						          </a>
 						        </div>
 						        {% if user|has_role:'professor' or user|has_role:'system_admin' %}
-							        <div class="col-xs-4 col-md-3" id="divMoreActions">
+							        <div class="col-xs-4 col-md-2" id="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>
diff --git a/courses/templates/subject/index.html b/courses/templates/subject/index.html
index a3b329c..8ce22a4 100644
--- a/courses/templates/subject/index.html
+++ b/courses/templates/subject/index.html
@@ -36,12 +36,12 @@
   	<div class="panel panel-info">
     	<div class="panel-heading">
 			<div class="row">
-	      		<div class="col-md-10 col-sm-9">
+	      		<div class="col-md-10 col-sm-10">
 	        		<h3>{{subject}}</h3>
 	      		</div>
 				{% professor_subject subject user as subject_professor%}
 	      		{% if subject_professor %}
-		         	 <div class="col-xs-4 col-md-3 divMoreActions">
+		         	 <div class="col-xs-4 col-md-2 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>
diff --git a/courses/views.py b/courses/views.py
index e1e7e9f..0717aec 100644
--- a/courses/views.py
+++ b/courses/views.py
@@ -305,6 +305,19 @@ class DeleteCatView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
 	model = CourseCategory
 	template_name = 'category/delete.html'
 
+	def dispatch(self, *args, **kwargs):
+		category = get_object_or_404(CourseCategory, slug = self.kwargs.get('slug'))
+		if(not has_object_permission('delete_category', self.request.user, category)):
+			return self.handle_no_permission()
+		return super(DeleteCatView, self).dispatch(*args, **kwargs)
+
+
+	def get_context_data(self, **kwargs):
+		context = super(DeleteCatView, self).get_context_data(**kwargs)
+		context['course'] = self.object.course_category
+		context['category'] = self.object
+		return context
+
 	def get_success_url(self):
 		messages.success(self.request, _('Category deleted successfully!'))
 		return reverse_lazy('course:manage_cat')
--
libgit2 0.21.2