diff --git a/src/scripts/app.js b/src/scripts/app.js
index 77547c0..be6a978 100644
--- a/src/scripts/app.js
+++ b/src/scripts/app.js
@@ -87,9 +87,9 @@ var App = function() {
   }
   
   function editTask() {
-    $(document).on('dblclick', '.card-details p', function(e) {
+    $(document).on('dblclick', '.card-details', function(e) {
       e.stopPropagation();
-      $(this).attr('contenteditable','true').parents('.card').addClass('edit-mode');
+      $(this).find('p').attr('contenteditable','true').parents('.card').addClass('edit-mode');
     });
     
     $(document).on('input', '.card p', function() {
@@ -118,14 +118,18 @@ var App = function() {
   function draggable() {
     $('.card').draggable({
       handle: 'h5',
-      revert: true,
-      cursor: 'move',
-      start: function(event, ui) {
-        
+      revert: false,
+      helper: function(e) {
+        //Cloning element, to enable draggable elements move out of scrollable parent element.
+        var original = $(e.target).hasClass("ui-draggable") ? $(e.target) : $(e.target).closest(".ui-draggable");
+        return original.clone().css({
+          width: original.width()
+        });
       },
-      stop: function(event, ui) {
-        
-      }
+      scroll: false,
+      cursor: 'move',
+      start: function(event, ui) {},
+      stop: function(event, ui) {}
     });
   }
   
diff --git a/src/stylesheets/app.scss b/src/stylesheets/app.scss
index c18d536..5f2e3f8 100644
--- a/src/stylesheets/app.scss
+++ b/src/stylesheets/app.scss
@@ -126,6 +126,7 @@ header {
     height: 100%;
     border-right: 1px solid $base-color;
     width: 20%;
+    overflow: scroll;
   }
 }