diff --git a/client/index.html b/client/index.html
index 018def2..b935137 100644
--- a/client/index.html
+++ b/client/index.html
@@ -74,10 +74,11 @@
     <script src="./js/requests/identity.js"></script>
 
     <!-- Include controller -->
-    <script src="./js/controllers/home.js"></script>
     <script src="./js/controllers/login.js"></script>
-    <script src="./js/controllers/network.js"></script>
     <script src="./js/controllers/status.js"></script>
+    <script src="./js/controllers/home/main.js"></script>
+    <script src="./js/controllers/network/main.js"></script>
+
 
 
 
diff --git a/client/js/app.js b/client/js/app.js
index c931d7e..0e9c423 100644
--- a/client/js/app.js
+++ b/client/js/app.js
@@ -6,11 +6,11 @@ var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize']);
 mainApp.config(['$routeProvider', function($routeProvider){
         $routeProvider.
                 when('/home',{
-                    templateUrl: 'partials/home.html',
+                    templateUrl: 'partials/home/main.html',
                     controller: 'homeCtrl'
         }).
                 when('/network',{
-                    templateUrl: 'partials/network.html',
+                    templateUrl: 'partials/network/main.html',
                     controller: 'networkCtrl'
         }).otherwise({
             redirectTo: '/home'
diff --git a/client/js/controllers/home.js b/client/js/controllers/home/main.js
similarity index 100%
rename from client/js/controllers/home.js
rename to client/js/controllers/home/main.js
diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index 6de348c..026ce36 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -4,11 +4,14 @@
  * and open the template in the editor.
  */
 
-
+/**
+ * Represents a book.
+ * @constructor
+ */
 mainApp.controller('loginCtrl', function ($scope,$interval,$sce)
 {
      // Define default states
-     $('#loginModal').modal({backdrop: 'static', keyboard: false});
+     //$('#loginModal').modal({backdrop: 'static', keyboard: false});
      $('#loadingLoginButton').hide();
      $('#failedToLoginAlert').hide();
      
diff --git a/client/js/controllers/network.js b/client/js/controllers/network/main.js
similarity index 100%
rename from client/js/controllers/network.js
rename to client/js/controllers/network/main.js
diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js
index c24997e..42a54d4 100644
--- a/client/js/controllers/status.js
+++ b/client/js/controllers/status.js
@@ -6,7 +6,8 @@
 
 mainApp.controller('statusCtrl', function ($scope,$interval,$sce)
 {
-    
+    $scope.username="John Doe";
+    $scope.projectname="Web Server";
     // Update status every 2 seconds
     /*$interval(function(){   
         var status=identity.fetchStatus();
diff --git a/client/partials/home.html b/client/partials/home/main.html
similarity index 100%
rename from client/partials/home.html
rename to client/partials/home/main.html
diff --git a/client/partials/login.html b/client/partials/login.html
index 8571e61..387b075 100644
--- a/client/partials/login.html
+++ b/client/partials/login.html
@@ -14,12 +14,12 @@
                 <div class="form-group">
                     <label label-default="" for="inputUser">User</label>
                     <input class="form-control" id="inputUser"
-                    placeholder="Enter email" type="text" ng-model="identityFormData.user">
+                    placeholder="Email" type="text" ng-model="identityFormData.user">
                 </div>
                 <div class="form-group">
                     <label label-default="" for="inputProject">Project</label>
                     <input class="form-control" id="inputProject"
-                    placeholder="Password" type="password" ng-model="identityFormData.project">
+                    placeholder="Project Name" type="password" ng-model="identityFormData.project">
                 </div>
                 <div class="form-group">
                     <label label-default="" for="inputPassword">Password</label>
diff --git a/client/partials/nav.html b/client/partials/nav.html
index c52ba4d..f412597 100644
--- a/client/partials/nav.html
+++ b/client/partials/nav.html
@@ -17,10 +17,11 @@
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 
       <ul class="nav navbar-nav">
-          <li class="nav-divider"></li>
-          <li><a href="#">User : {{ username }}</a></li>
-        <li><a href="#">Last Connection : {{ lastconnection }}</a></li>
-        <li><a href="#" >Connection : <span ng-bind-html="connection"></span></a></li>
+        <li class="nav-divider"></li>
+        <li><a href="#">User : {{ username }}</a></li>
+        <li><a href="#">Project Name : {{ projectname }}</a></li>
+
+        <!--<li><a href="#" >Connection : <span ng-bind-html="connection"></span></a></li>-->
 
       </ul>
     
@@ -31,7 +32,7 @@
             <li><a href="#">Informations</a></li>
             <li><a href="#">Settings</a></li>
             <li role="separator" class="divider"></li>
-            <li><a href="#myModal" data-toggle="modal" data-target="#loginModal">Login</a>
+            <li><a href="#myModal" data-toggle="modal">Logout</a>
             </li>
           </ul>
         </li>
diff --git a/client/partials/network.html b/client/partials/network/main.html
similarity index 100%
rename from client/partials/network.html
rename to client/partials/network/main.html