diff --git a/amadeus/static/js/topics.js b/amadeus/static/js/topics.js
index 78d5243..1a26f35 100644
--- a/amadeus/static/js/topics.js
+++ b/amadeus/static/js/topics.js
@@ -1,4 +1,4 @@
-$('.collapse').on('show.bs.collapse', function (e) {
+$('.topic-panel').on('show.bs.collapse', function (e) {
     if($(this).is(e.target)){
         var btn = $(this).parent().find('.fa-angle-right');
 
@@ -11,7 +11,7 @@ $('.collapse').on('show.bs.collapse', function (e) {
 });
 
 // Update breadcrumb with topic's name
-$('.collapse').on('shown.bs.collapse', function (e) {
+$('.topic-panel').on('shown.bs.collapse', function (e) {
     if($(this).is(e.target)){
         var li = $(".breadcrumb").find('li:last-child');
     	var li_text = $(li).html();
@@ -28,7 +28,7 @@ $('.collapse').on('shown.bs.collapse', function (e) {
 });
 
 // Reset breadcrumb to it's normal state
-$('.collapse').on('hide.bs.collapse', function (e) {
+$('.topic-panel').on('hide.bs.collapse', function (e) {
     if($(this).is(e.target)){
         var btn = $(this).parent().find('.fa-angle-down');
             
diff --git a/topics/templates/topics/list.html b/topics/templates/topics/list.html
index bbed1bf..23491a7 100644
--- a/topics/templates/topics/list.html
+++ b/topics/templates/topics/list.html
@@ -34,7 +34,7 @@
 		                </div>
 		            </div>
 		        </div>
-			    <div id="{{topic.slug}}" class="panel-collapse collapse category-panel-content">
+			    <div id="{{topic.slug}}" class="panel-collapse collapse category-panel-content topic-panel">
 			    	<input type="hidden" class="id_inp" name="id" value="{{ topic.id }}" />
 			    	<input type="hidden" class="order_inp" name="order" value="{{ topic.order }}" />
 			    	
diff --git a/webpage/templates/webpages/view.html b/webpage/templates/webpages/view.html
index 393cbf3..c94e042 100644
--- a/webpage/templates/webpages/view.html
+++ b/webpage/templates/webpages/view.html
@@ -34,21 +34,22 @@
 		<div class="panel panel-info topic-panel-invisible">
         	<div class="panel-heading panel-invisible">
     {% endif %}
-    		<div class="row">
-                <div class="col-md-12 category-header">
-                    <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
-                        <span>{{ webpage }}</span>
-                    </h4>
+        		<div class="row">
+                    <div class="col-md-12 category-header">
+                        <h4 class="panel-title" style="margin-top: 10px; margin-bottom: 8px">
+                            <span>{{ webpage }}</span>
+                        </h4>
 
-                    <div class="col-md-5 pull-right category-card-items">
-                        <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
+                        <div class="col-md-5 pull-right category-card-items">
+                            <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <div id="{{subject.slug}}" class="panel-collapse in collapse category-panel-content">
-            {% autoescape off %}
-        	   {{ webpage.content }}
-            {% endautoescape %}
+            <div id="{{subject.slug}}" class="panel-collapse in collapse category-panel-content">
+                {% autoescape off %}
+            	   {{ webpage.content }}
+                {% endautoescape %}
+            </div>
         </div>
 {% endblock %}
--
libgit2 0.21.2