diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css
index 52355c2..dd6a202 100755
--- a/amadeus/static/css/base/amadeus.css
+++ b/amadeus/static/css/base/amadeus.css
@@ -792,4 +792,12 @@ a.add-row {
 
 .resource_list a:hover, .resource_list a:focus {
     text-decoration: none;
+}
+
+.add_resource i {
+    margin-right: 10px;
+}
+
+.add_resource ul {
+    width: 100%;
 }
\ No newline at end of file
diff --git a/subjects/templates/subjects/view.html b/subjects/templates/subjects/view.html
index 5faa3a1..53cbac5 100644
--- a/subjects/templates/subjects/view.html
+++ b/subjects/templates/subjects/view.html
@@ -81,5 +81,17 @@
         {% if resource_new_page %}
             window.open("{{ resource_new_page_url }}");
         {% endif %}
+
+        $(function (){
+            var topic_slug = "{{ topic_slug }}"
+
+            if (topic_slug != "") {
+                $("#" + topic_slug).collapse('show');
+
+                $('html, body').animate({
+                    scrollTop: $("#" + topic_slug).parent().offset().top
+                }, 1000);
+            }
+        });
     </script>
 {% endblock content %}
\ No newline at end of file
diff --git a/subjects/urls.py b/subjects/urls.py
index 13830e5..ae7c6b8 100644
--- a/subjects/urls.py
+++ b/subjects/urls.py
@@ -10,6 +10,7 @@ urlpatterns = [
 	url(r'^update/(?P<slug>[\w_-]+)/$', views.SubjectUpdateView.as_view(), name='update'),
 	url(r'^delete/(?P<slug>[\w_-]+)/$', views.SubjectDeleteView.as_view(), name='delete'),
 	url(r'^view/(?P<slug>[\w_-]+)/$', views.SubjectDetailView.as_view(), name='view'),
+	url(r'^view/(?P<slug>[\w_-]+)/(?P<topic_slug>[\w_-]+)/$', views.SubjectDetailView.as_view(), name='topic_view'),
 	url(r'^subscribe/(?P<slug>[\w_-]+)/$', views.SubjectSubscribeView.as_view(), name='subscribe'),
 	url(r'^search/$', views.SubjectSearchView.as_view(), name='search'),
 	url(r'^search/(?P<option>[\w_-]+)/$', views.SubjectSearchView.as_view(), name='search'),
diff --git a/subjects/views.py b/subjects/views.py
index 22ade31..35d957f 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -427,6 +427,9 @@ class SubjectDetailView(LoginRequiredMixin, DetailView):
 
             self.request.session['resources'] = None
 
+        if self.kwargs.get('topic_slug'):
+            context['topic_slug'] = self.kwargs.get('topic_slug')
+
         return context
 
 
diff --git a/webpage/templates/webpages/create.html b/webpage/templates/webpages/create.html
index bdcaaeb..f066099 100644
--- a/webpage/templates/webpages/create.html
+++ b/webpage/templates/webpages/create.html
@@ -16,7 +16,7 @@
 {% block breadcrumbs %}
 	{{ block.super }}
 
-	{% breadcrumb topic 'subjects:view' topic.subject.slug %}
+	{% breadcrumb topic 'subjects:topic_view' topic.subject.slug topic.slug %}
 	
 	{% trans 'Create Webpage' as bread %}
 	{% breadcrumb bread 'webpages:create' topic.slug %}
diff --git a/webpage/templates/webpages/update.html b/webpage/templates/webpages/update.html
index 25e3d1f..7dbe79f 100644
--- a/webpage/templates/webpages/update.html
+++ b/webpage/templates/webpages/update.html
@@ -16,7 +16,7 @@
 {% block breadcrumbs %}
 	{{ block.super }}
 
-	{% breadcrumb topic 'subjects:view' topic.subject.slug %}
+	{% breadcrumb topic 'subjects:topic_view' topic.subject.slug topic.slug %}
 	
 	{% trans 'Edit: ' as bread %}
 	{% with bread|add:webpage.name as bread_slug %}
diff --git a/webpage/templates/webpages/view.html b/webpage/templates/webpages/view.html
index f6ba3c0..393cbf3 100644
--- a/webpage/templates/webpages/view.html
+++ b/webpage/templates/webpages/view.html
@@ -9,7 +9,7 @@
 
 {% block breadcrumbs %}
     {{ block.super }}
-    {% breadcrumb topic 'subjects:view' subject.slug %}
+    {% breadcrumb topic 'subjects:topic_view' subject.slug topic.slug %}
     {% breadcrumb webpage 'webpages:view' webpage.slug %}
 {% endblock %}
 
--
libgit2 0.21.2