diff --git a/template/base.html b/template/base.html
index ee790ff..82497cd 100644
--- a/template/base.html
+++ b/template/base.html
@@ -1,4 +1,5 @@
 {% load staticfiles %}
+{% load get %}
 <!DOCTYPE html>
 <html>
 <head>
@@ -52,7 +53,7 @@
                 <li class="dropdown tasks-menu">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                         <span class="far fa-folder-open"> </span>
-                       <span>{{ user.project_id }}</span>
+                       <span>{{ user.project_name }}</span>
                         <span class="fa fa-caret-down"></span>
                     </a>
                     <ul class="dropdown-menu">
@@ -61,20 +62,19 @@
                             <!-- inner menu: contains the actual data -->
                             <ul class="menu">
                                 {% for p in request.session.projects %}
-                                    {% if p == user.project_id %}
+                                    {% if p.name == user.project_name %}
                                         <li>
                                             <a href="#">
                                                 <h3>
-                                                    <i class="fa fa-folder-open"></i> <span>{{ p }}</span>
+                                                    <i class="fa fa-folder-open"></i> <span>{{ p.name }}</span>
                                                 </h3>
-
                                             </a>
                                         </li>
                                     {% else %}
                                         <li>
-                                            <a href="{% url 'projects:switch_project' project_id=p %}">
+                                            <a href="{% url 'projects:switch_project' project_id=p|get:"_id" %}">
                                                 <h3>
-                                                    <i class="fa fa-folder"></i> <span>{{ p }}</span>
+                                                    <i class="fa fa-folder"></i> <span>{{ p.name }}</span>
                                                 </h3>
                                             </a>
                                         </li>
@@ -163,21 +163,21 @@
 <!-- ./wrapper -->
 
 <!-- jQuery 3 -->
-<script src="/static/bower_components/jquery/dist/jquery.min.js"></script>
+<script src="/static/node_modules/jquery/dist/jquery.min.js"></script>
 <!-- Bootstrap 3.3.7 -->
-<script src="/static/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+<script src="/static/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
 <!-- FastClick -->
-<script src="/static/bower_components/fastclick/lib/fastclick.js"></script>
+<script src="/static/node_modules/fastclick/lib/fastclick.js"></script>
 <!-- AdminLTE App -->
-<script src="/static/bower_components/admin-lte/dist/js/adminlte.min.js"></script>
+<script src="/static/node_modules/admin-lte/dist/js/adminlte.min.js"></script>
 <!-- iCheck -->
-<script src="/static/bower_components/admin-lte/plugins/iCheck/icheck.min.js"></script>
+<script src="/static/node_modules/admin-lte/plugins/iCheck/icheck.min.js"></script>
 <!-- pace -->
-<script src="/static/bower_components/admin-lte/plugins/pace/pace.min.js"></script>
+<script src="/static/node_modules/admin-lte/plugins/pace/pace.min.js"></script>
 <!-- momentjs -->
-<script src="/static/bower_components/moment/moment.js"></script>
+<script src="/static/node_modules/moment/moment.js"></script>
 <!-- bootbox -->
-<script src="/static/bower_components/bootbox.js/bootbox.js"></script>
+<script src="/static/node_modules/bootbox/dist/bootbox.min.js"></script>
 <!-- RDCL3D AdminLTE session storage handler -->
 <script src="/static/src/adminlte_session_storage.js"></script>
 <!-- Utility JS -->