diff --git a/projecthandler/template/project/project_descriptors.html b/projecthandler/template/project/project_descriptors.html
index e427313..26a1962 100644
--- a/projecthandler/template/project/project_descriptors.html
+++ b/projecthandler/template/project/project_descriptors.html
@@ -4,7 +4,7 @@
 
 {% block head_block %}
   	{{ block.super }}
-    <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 {% endblock %}
 {% block title_header_big %}
 
@@ -15,8 +15,15 @@
 {% endblock %}
 
 {% block breadcrumb_body %}
-  	{{ block.super }}
-    <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+      {{ block.super }}
+        {% if user.is_admin %}
+        <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+        {% else%}
+        <li><a href="#">Projects</a></li>
+        {% endif %}
+
+    
+
 {% endblock %}
 
 {% block content_body %}
@@ -46,8 +53,8 @@
 {% block resource_block %}
   	{{ block.super }}
 
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
 
 {% endblock %}
 
diff --git a/projecthandler/template/project/project_details.html b/projecthandler/template/project/project_details.html
index aac2983..f8790fd 100644
--- a/projecthandler/template/project/project_details.html
+++ b/projecthandler/template/project/project_details.html
@@ -24,7 +24,11 @@
 
 {% block breadcrumb_body %}
   	{{ block.super }}
-    <li><a href="{% url 'projects:projects_list' %}">Projects</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_overview.name}}</a></li>
 {% endblock %}
 
diff --git a/projecthandler/template/project/projectlist.html b/projecthandler/template/project/projectlist.html
index 62282ad..9e259fe 100644
--- a/projecthandler/template/project/projectlist.html
+++ b/projecthandler/template/project/projectlist.html
@@ -5,7 +5,7 @@
 
 {% block head_block %}
   	{{ block.super }}
-    <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 
 {% endblock %}
 {% block title_header_big %}
@@ -20,7 +20,11 @@
 
 {% block breadcrumb_body %}
   	{{ block.super }}
-    <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+      {% if user.is_admin %}
+      <li><a href="{% url 'projects:projects_list' %}">Projects</a></li>
+      {% else%}
+      <li><a href="#">Projects</a></li>
+      {% endif %}
 {% endblock %}
 
 {% block content_body %}
@@ -63,8 +67,8 @@
 
 {% block resource_block %}
   	{{ block.super }}
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
 
     <script>
         var table;
diff --git a/projecthandler/urls/project.py b/projecthandler/urls/project.py
index 1660607..d017922 100644
--- a/projecthandler/urls/project.py
+++ b/projecthandler/urls/project.py
@@ -22,9 +22,9 @@
     url(r'^list/', views.user_projects, name='projects_list'),
     url(r'^new/', views.create_new_project, name='new_project'),
     url(r'^descriptors/', include('descriptorhandler.urls', namespace='descriptors'), name='descriptor_base'),
-    url(r'^(?P<project_id>[\w ]+)/delete$', views.delete_project, name='delete_project'),
-    url(r'^(?P<project_id>[\w ]+)/switch', views.switch_project, name='switch_project'),
-    url(r'^(?P<project_id>[\w ]+)/edit', views.edit_project, name='edit_project'),
+    url(r'^(?P<project_id>[-\w]+)/delete$', views.delete_project, name='delete_project'),
+    url(r'^(?P<project_id>[-\w]+)/switch', views.switch_project, name='switch_project'),
+    url(r'^(?P<project_id>[-\w]+)/edit', views.edit_project, name='edit_project'),
 
 
 
diff --git a/projecthandler/views.py b/projecthandler/views.py
index 6a9a98a..8d4ac83 100644
--- a/projecthandler/views.py
+++ b/projecthandler/views.py
@@ -77,7 +77,7 @@
         vnf = client.vnf_list(user.get_token())
         project_overview = {
             'owner': user.username,
-            'name': project_id,
+            'name': user.project_name,
             'updated_date': prj['data']['_admin']['modified'] if prj and prj['error'] is False else '-',
             'created_date': prj['data']['_admin']['created'] if prj and prj['error'] is False else '-',