diff --git a/descriptorhandler/template/composer.html b/descriptorhandler/template/composer.html
index f0c2e9a..085510d 100644
--- a/descriptorhandler/template/composer.html
+++ b/descriptorhandler/template/composer.html
@@ -70,8 +70,8 @@
     {{ block.super }}
 
     <!-- d3.js -->
-    <script src="/static/bower_components/d3/d3.js"></script>
-    <script src="/static/bower_components/moment/moment.js"></script>
+    <script src="/static/node_modules/d3/build/d3.js"></script>
+    <script src="/static/node_modules/moment/moment.js"></script>
 
     <!-- TopologyComposer D3 -->
     <script src="/static/TopologyComposer/js/event.js"></script>
diff --git a/descriptorhandler/template/descriptor_view.html b/descriptorhandler/template/descriptor_view.html
index fec5168..13c7b18 100644
--- a/descriptorhandler/template/descriptor_view.html
+++ b/descriptorhandler/template/descriptor_view.html
@@ -15,7 +15,12 @@
 
 {% block breadcrumb_body %}
 {{ block.super }}
-<li><a href="{% url 'projects:open_project' %}">{{project_id}}</a></li>
+{% if user.is_admin %}
+        <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+{% else%}
+        <li><a href="#">Projects</a></li>
+{% endif %}
+<li><a href="{% url 'projects:open_project' %}">{{project_name}}</a></li>
 <li><a>{{descriptor_id}}</a></li>
 {% endblock %}
 
diff --git a/descriptorhandler/template/descriptor_view_base.html b/descriptorhandler/template/descriptor_view_base.html
index 6f7618a..7315c0b 100644
--- a/descriptorhandler/template/descriptor_view_base.html
+++ b/descriptorhandler/template/descriptor_view_base.html
@@ -7,11 +7,11 @@
 
 
     <!-- Codemirror core CSS -->
-    <link rel="stylesheet" href="/static/bower_components/codemirror/lib/codemirror.css" >
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/fold/foldgutter.css"  />
-    <link rel="stylesheet" href="/static/bower_components/codemirror/theme/neat.css" >
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/dialog/dialog.css" >
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/display/fullscreen.css" >
+    <link rel="stylesheet" href="/static/node_modules/codemirror/lib/codemirror.css" >
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/fold/foldgutter.css"  />
+    <link rel="stylesheet" href="/static/node_modules/codemirror/theme/neat.css" >
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/dialog/dialog.css" >
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/display/fullscreen.css" >
 
 {% endblock %}
 
@@ -63,21 +63,21 @@
   	{{ block.super }}
 
 
-    <script src="/static/bower_components/codemirror/lib/codemirror.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldcode.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldgutter.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/fold/brace-fold.js" ></script>
-    <script src="/static/bower_components/codemirror/mode/javascript/javascript.js" ></script>
-    <script src="/static/bower_components/codemirror/mode/yaml/yaml.js" ></script>
-    <script src="/static/bower_components/codemirror/mode/markdown/markdown.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/search/searchcursor.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/search/search.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/dialog/dialog.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/display/autorefresh.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/edit/matchbrackets.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/edit/closebrackets.js" ></script>
-    <script src="/static/bower_components/codemirror/addon/display/fullscreen.js" ></script>
-    <script src="/static/bower_components/codemirror/keymap/sublime.js" ></script>
+    <script src="/static/node_modules/codemirror/lib/codemirror.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldcode.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldgutter.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/fold/brace-fold.js" ></script>
+    <script src="/static/node_modules/codemirror/mode/javascript/javascript.js" ></script>
+    <script src="/static/node_modules/codemirror/mode/yaml/yaml.js" ></script>
+    <script src="/static/node_modules/codemirror/mode/markdown/markdown.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/search/searchcursor.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/search/search.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/dialog/dialog.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/display/autorefresh.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/edit/matchbrackets.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/edit/closebrackets.js" ></script>
+    <script src="/static/node_modules/codemirror/addon/display/fullscreen.js" ></script>
+    <script src="/static/node_modules/codemirror/keymap/sublime.js" ></script>
 
 
     <script>
diff --git a/descriptorhandler/views.py b/descriptorhandler/views.py
index 912df09..4e22a5d 100644
--- a/descriptorhandler/views.py
+++ b/descriptorhandler/views.py
@@ -148,6 +148,7 @@
 def edit_descriptor(request, descriptor_id=None, descriptor_type=None):
     user = osmutils.get_user(request)
     project_id = user.project_id
+    project_name = user.project_name
     if request.method == 'POST':
         new_data = request.POST.get('text'),
         data_type = request.POST.get('type')
@@ -199,6 +200,7 @@
         # print descriptor
         return render(request, page, {
             'project_id': project_id,
+            'project_name': project_name,
             'descriptor_id': descriptor_id,
             'descriptor_type': descriptor_type,
             'descriptor_strings': {'descriptor_string_yaml': descriptor_string_yaml,