diff --git a/desktopapp/controllers.js b/desktopapp/controllers.js
index 97f4503..656a647 100644
--- a/desktopapp/controllers.js
+++ b/desktopapp/controllers.js
@@ -32,16 +32,31 @@ angular.module('workApp', [])
             id: $scope.projects[$scope.projects.length-1].id+1
         };
     };
+    $scope.editingIndex="";
+    $scope.editProject = function(index){
+        $scope.editingIndex=index;
+        $scope.editingProject=angular.copy($scope.projects[index]);
+    };
+    $scope.cancelEditProject = function(){
+        $scope.editingProject=false;
+    };
+    $scope.updateProject = function(){
+        $scope.projects[$scope.editingIndex]=angular.copy($scope.editingProject);
+        $scope.currentproject=angular.copy($scope.editingProject);
+        $scope.editingProject=false;
+    };
     $scope.removeProject = function(index){
         $scope.projects.splice(index, 1);
         localStorage.setItem("w_l_projects", angular.toJson($scope.projects));
     };
     $scope.projectSelect = function(index){
+        $scope.btnStop();
         $scope.currentproject=$scope.projects[index];
     };
     var interval;
     $scope.currentStrike=0;
     $scope.btnWork = function(){
+        $scope.editingProject=false;
         $scope.working=true;
         $scope.currentStrike=0;
         interval = $interval(function(){
diff --git a/desktopapp/img/apibrowser.png b/desktopapp/img/apibrowser.png
new file mode 100644
index 0000000..1b9a104
Binary files /dev/null and b/desktopapp/img/apibrowser.png differ
diff --git a/desktopapp/img/browser.png b/desktopapp/img/browser.png
new file mode 100644
index 0000000..97696e4
Binary files /dev/null and b/desktopapp/img/browser.png differ
diff --git a/desktopapp/img/codetags.png b/desktopapp/img/codetags.png
new file mode 100644
index 0000000..5a82984
Binary files /dev/null and b/desktopapp/img/codetags.png differ
diff --git a/desktopapp/img/diagram.png b/desktopapp/img/diagram.png
new file mode 100644
index 0000000..8a3b934
Binary files /dev/null and b/desktopapp/img/diagram.png differ
diff --git a/desktopapp/img/edit.png b/desktopapp/img/edit.png
new file mode 100644
index 0000000..ce360d7
Binary files /dev/null and b/desktopapp/img/edit.png differ
diff --git a/desktopapp/img/monitor.png b/desktopapp/img/monitor.png
new file mode 100644
index 0000000..7653f3f
Binary files /dev/null and b/desktopapp/img/monitor.png differ
diff --git a/desktopapp/img/smartphone.png b/desktopapp/img/smartphone.png
new file mode 100644
index 0000000..a971994
Binary files /dev/null and b/desktopapp/img/smartphone.png differ
diff --git a/desktopapp/img/statistics.png b/desktopapp/img/statistics.png
new file mode 100644
index 0000000..5e1add8
Binary files /dev/null and b/desktopapp/img/statistics.png differ
diff --git a/desktopapp/img/tablet.png b/desktopapp/img/tablet.png
new file mode 100644
index 0000000..8875d15
Binary files /dev/null and b/desktopapp/img/tablet.png differ
diff --git a/desktopapp/index.html b/desktopapp/index.html
index 6fb1f72..90df1d5 100644
--- a/desktopapp/index.html
+++ b/desktopapp/index.html
@@ -51,16 +51,21 @@
                         <span class="card-title">Projects</span>
                         <div class="collection">
                           <a href="#!" ng-click="projectSelect($index)" ng-repeat="project in projects" class="collection-item avatar blue-grey lighten-4">
-                              <div class="waves-effect waves-light btn-floating blue-grey lighten-2 right" ng-click="removeProject($index)">
-                                  <i class="material-icons"><img src="img/trash.png" class="o_trash_icon" /></i>
-                              </div>
-                              <img ng-src="img/coding/{{project.icon}}.png" class="circle"/>
+                                <div class="right">
+                                    <div class="waves-effect waves-light btn-floating blue-grey lighten-2" ng-click="editProject($index)">
+                                        <i class="material-icons"><img src="img/edit.png" class="o_trash_icon" /></i>
+                                    </div>
+                                    <div class="waves-effect waves-light btn-floating blue-grey lighten-2" ng-click="removeProject($index)">
+                                        <i class="material-icons"><img src="img/trash.png" class="o_trash_icon" /></i>
+                                    </div>
+                                </div>
+                              <img ng-src="img/{{project.icon}}.png" class="circle"/>
                               <span class="title">{{project.title}}</span>
                               <p class="grey-text">{{project.totaltime | secondsToDateTime | date:'HH:mm:ss'}}</p>
                           </a>
                       </div>
                     </div>
-                    <div class="card-action">
+                    <div class="card-action" ng-show="!editingProject">
                         <div class="input-field col s6">
                           <input ng-model="newproject.title" id="newprojectname" type="text" class="validate">
                           <label for="newprojectname">New project name</label>
@@ -71,12 +76,24 @@
                         </div>
                         <a ng-click="addNewProject()" class="waves-effect waves-light btn blue-grey lighten-1 right">Add new project</a>
                     </div>
+                    <div class="card-action" ng-show="editingProject">
+                        <div class="input-field col s6">
+                          <input ng-model="editingProject.title" id="newprojectname" value=" " type="text" class="validate">
+                          <label for="newprojectname">New project name</label>
+                        </div>
+                        <div class="input-field col s6">
+                          <input ng-model="editingProject.icon" id="icon" value=" " type="text" class="validate">
+                          <label for="icon">icon</label>
+                        </div>
+                        <a ng-click="cancelEditProject()" class="waves-effect waves-light btn red lighten-2">Cancel</a>
+                        <a ng-click="updateProject()" class="waves-effect waves-light btn blue lighten-2 right">Update project</a>
+                    </div>
                 </div>
 
                 <div ng-show="currentproject.title" class="card blue-grey lighten-4 col s12 m7 l7">
                     <div class="card-content">
                         <span class="card-title">
-                            <img ng-src="img/coding/{{currentproject.icon}}.png" class="o_project_title_img"/>
+                            <img ng-src="img/{{currentproject.icon}}.png" class="o_project_title_img"/>
                             {{currentproject.title}}
                         </span>
                         <p>
@@ -94,6 +111,11 @@
                         <!--<a class="waves-effect waves-light btn deep-orange lighten-2">Stop working!</a>-->
                     </div>
                 </div>
+                <div ng-show="!currentproject.title" class="card blue-grey lighten-4 col s12 m7 l7" style="height: 200px;">
+                    <span class="card-title">
+                        Select a project
+                    </span>
+                </div>
 
 
             </div>