diff --git a/public/javascripts/models/task.js b/public/javascripts/models/task.js
index 460c228..274bd1a 100644
--- a/public/javascripts/models/task.js
+++ b/public/javascripts/models/task.js
@@ -5,11 +5,12 @@ define(
 function(
 Backbone
 ) {
-	
+
   var TaskModel = Backbone.Model.extend({
 
     defaults: {
       parent: 0,
+	  parentId: 0,
       content: '',
       isCompleted: 0
     },
diff --git a/public/javascripts/views/list.js b/public/javascripts/views/list.js
index 5e7f665..93bc96a 100644
--- a/public/javascripts/views/list.js
+++ b/public/javascripts/views/list.js
@@ -37,10 +37,10 @@ TaskView
         model: task
       });
       var a = taskView.render();
-      if (a.model.get('parent')!=0)
-        a.$el.insertAfter($('*[data-id="'+a.model.get('parent')+'"]').parents('li:first'));
-      else
+      if (a.model.get('parent')===null||a.model.get('parent')===0)
         this.$el.append(a.el);
+      else
+        a.$el.insertAfter($('*[data-id="'+a.model.get('parent')+'"]').parents('li:first'));
     }
 
  });
diff --git a/public/javascripts/views/task.js b/public/javascripts/views/task.js
index de1c2ba..aa9efea 100644
--- a/public/javascripts/views/task.js
+++ b/public/javascripts/views/task.js
@@ -1,154 +1,177 @@
 define(
-['jquery',
-'backbone',
-'socket',
-'util/constants',
-'text!../../templates/task.html'
-],
+    ['jquery',
+        'backbone',
+        'socket',
+        'util/constants',
+        'text!../../templates/task.html'
+    ],
 
-function(
-$,
-Backbone,
-io,
-constants,
-taskTemplate
-) {
+    function (
+        $,
+        Backbone,
+        io,
+        constants,
+        taskTemplate
+    ) {
 
-  var TaskView = Backbone.View.extend({
+        var TaskView = Backbone.View.extend({
 
-    tagName: 'li',
-    template: taskTemplate,
+            tagName: 'li',
+            template: taskTemplate,
 
-    events: {
-      'click .task': 'edit',
-      'blur .edit': 'close',
-      'keyup .edit': 'handleKeyup',
-      'keypress .edit': 'update',
-      'mouseover .link':'showOptions',
-      'mouseout .link':'hideOptions',
-      'click .complete':'markComplete',
-      'click .uncomplete':'unmarkComlete',
-      'click .note':'addNote'
-    },
+            events: {
+                'click .task': 'edit',
+                'blur .edit': 'close',
+                'keyup .edit': 'handleKeyup',
+                'keypress .edit': 'update',
+                'mouseover .link': 'showOptions',
+                'mouseout .link': 'hideOptions',
+                'click .complete': 'markComplete',
+                'click .uncomplete': 'unmarkComlete',
+                'click .note': 'addNote'
+            },
 
-    initialize: function() {
-      this.listenTo(this.model, 'change', this.render);
-      this.listenTo(this.model, 'destroy', this.remove);
-      this.socket = io.connect();
-      var task = this;
-      this.socket.on('task', function(data){
-        if (task.model.id == data.id) {
-           task.model.set({'content':data.content, 'isCompleted':data.isCompleted});
-        }
-      });
-    },
+            initialize: function () {
+                this.listenTo(this.model, 'change', this.render);
+                this.listenTo(this.model, 'destroy', this.remove);
+                this.socket = io.connect();
+                var task = this;
+                this.socket.on('task', function (data) {
+                    if (task.model.id == data.id) {
+                        task.model.set({
+                            'content': data.content,
+                            'isCompleted': data.isCompleted
+                        });
+                    }
+                });
+            },
 
-    render: function() {
-      var tmpl = _.template(this.template);
-      var task = this;
-      this.$el.html(tmpl({model:this.model.toJSON()}));
-      if (this.model.get('parentId')!=0) {
-        this.$el.addClass('shift1');
-        var className = $('*[data-id="'+this.model.get('parentId')+'"]').parents('li:first').attr('class');
-        if (className!=undefined && className!=0 && className.substring(0,5) == 'shift') {
-          this.$el.removeClass();
-          this.$el.addClass('shift' + (parseInt(className.charAt(5))+1));
-        }
-      }
-      this.$input = this.$('.edit:first');
+            render: function () {
+                var tmpl = _.template(this.template);
+                var task = this;
+                this.$el.html(tmpl({
+                    model: this.model.toJSON()
+                }));
+                if (this.model.get('parentId') != 0) {
+                    this.$el.addClass('shift1');
+                    var className = $('*[data-id="' + this.model.get('parentId') + '"]').parents('li:first').attr('class');
+                    if (className != undefined && className != 0 && className.substring(0, 5) == 'shift') {
+                        this.$el.removeClass();
+                        this.$el.addClass('shift' + (parseInt(className.charAt(5)) + 1));
+                    }
+                }
+                this.$input = this.$('.edit:first');
 
-      return this;
-    },
+                return this;
+            },
 
-    edit: function() {
-      this.$el.addClass('editing');
-      this.$input.focus();
-    },
+            edit: function () {
+                this.$el.addClass('editing');
+                this.$input.focus();
+            },
 
-    handleKeyup: function(e) {
-      if (e.keyCode == 40)
-        this.$el.next('li').find('input').focus();
-      else if (e.keyCode == 38)
-        this.$el.prev('li').find('input').focus();
+            handleKeyup: function (e) {
+                // down arrow
+                if (e.keyCode == 40)
+                    this.$el.next('li').find('input').focus();
+                // Up arrow
+                else if (e.keyCode == 38)
+                    this.$el.prev('li').find('input').focus();
 
-      if (e.shiftKey && e.keyCode == 9) {
-        var model = this.$el.next('li').find('input').data('id');
-        model = Tasks.get(model);
-        var old_parent = model.get('parentId');
-        old_parent = Tasks.get(old_parent);
-        var new_parent = old_parent.get('parentId');
-        if (new_parent == null) new_parent = 0;
-        model.set('parentId',new_parent);
-        model.save({content: model.get('content'), parentId: model.get('parentId')});
-      }
-      else if (e.keyCode == 9) {
-        var parent = this.$el.prev('li').prev('li').find('input').data('id');
-        var current = this.$el.prev('li').find('input').data('id');
-        var model = Tasks.get(current);
-        model.set('parentId',parent);
-        model.save({content: model.get('content'), parentId: model.get('parentId')});
-      }
-      this.socket.emit('task', {
-        id: this.model.id,
-        parentId: this.model.parentId,
-        content: this.$input.val().trim(),
-        isCompleted:this.model.toJSON().isCompleted
-      });
-    },
+                // shift and tab
+                if (e.shiftKey && e.keyCode == 9) {
+                    var model = this.$el.next('li').find('input').data('id');
+                    model = Tasks.get(model);
+                    var old_parent = model.get('parentId');
+                    old_parent = Tasks.get(old_parent);
+                    var new_parent = old_parent.get('parentId');
+                    if (new_parent == null) new_parent = 0;
+                    model.set('parentId', new_parent);
+                    model.save({
+                        content: model.get('content'),
+                        parentId: model.get('parentId')
+                    });
+                }
+                // tab
+                else if (e.keyCode == 9) {
+                    var parent = this.$el.prev('li').prev('li').find('input').data('id');
+                    var current = this.$el.prev('li').find('input').data('id');
+                    var model = Tasks.get(current);
+                    model.set('parentId', parent);
+                    model.save({
+                        content: model.get('content'),
+                        parentId: model.get('parentId')
+                    });
+                }
 
-    update: function(e) {
-      if ( e.which === constants.ENTER_KEY ) {
-        Tasks.add({content:'', parentId: this.model.get('parentId')});
-        this.$input.blur();
-        this.$el.next('li').find('input').focus();
-      }
-    },
+                this.socket.emit('task', {
+                    id: this.model.id,
+                    parentId: this.model.parentId,
+                    content: this.$input.val().trim(),
+                    isCompleted: this.model.toJSON().isCompleted
+                });
+            },
 
-    close: function() {
-      var value = this.$input.val().trim();
-      if (value === '') {
-        this.model.destroy();
-      }
-      else {
-        this.model.save({content: value, parentId: this.model.attributes.parentId});
-      }
-      this.$el.removeClass('editing');
-    },
+            update: function (e) {
+                if (e.which === constants.ENTER_KEY) {
+                    this.addNote(e.currentTarget);
+                }
 
-    showOptions:function(){
-      this.$el.find('.options').show();
-    },
+            },
+            /** Finish editing an item **/
+            close: function () {
+                var value = this.$input.val().trim();
+                if (value === '') {
+                    this.model.destroy();
+                } else {
+                    this.model.save({
+                        content: value,
+                        parentId: this.model.attributes.parentId
+                    });
+                }
+                this.$el.removeClass('editing');
+            },
 
-    hideOptions:function(){
-      this.$el.find('.options').hide();
-    },
+            showOptions: function () {
+                this.$el.find('.options').show();
+            },
 
-    markComplete:function(){
-       this.model.toggelCompletedStatus(true);
-       this.socket.emit('task', {
-          id: this.model.id,
-          parentId: this.model.parentId,
-          content:this.model.toJSON().content,
-          isCompleted: this.model.toJSON().isCompleted
-      });
-    },
+            hideOptions: function () {
+                this.$el.find('.options').hide();
+            },
 
-    unmarkComlete:function(){
-       this.model.toggelCompletedStatus(false);
-        this.socket.emit('task', {
-          id: this.model.id,
-          parentId: this.model.parentId,
-          content:this.model.toJSON().content,
-          isCompleted: this.model.toJSON().isCompleted
-      });
-    },
+            markComplete: function () {
+                this.model.toggelCompletedStatus(true);
+                this.socket.emit('task', {
+                    id: this.model.id,
+                    parentId: this.model.parentId,
+                    content: this.model.toJSON().content,
+                    isCompleted: this.model.toJSON().isCompleted
+                });
+            },
 
-    addNote:function(){
-      this.$el.find('.divNote').show();
-    }
+            unmarkComlete: function () {
+                this.model.toggelCompletedStatus(false);
+                this.socket.emit('task', {
+                    id: this.model.id,
+                    parentId: this.model.parentId,
+                    content: this.model.toJSON().content,
+                    isCompleted: this.model.toJSON().isCompleted
+                });
+            },
 
- });
+            addNote: function (inputEle) {
+                var $inputEle = $(inputEle);
+                Tasks.add({
+                    content: '',
+                    parentId: this.model.get('parentId')
+                });
+                $inputEle.blur();
+                $inputEle.closest('li').next('li').find('input').focus();
+            }
 
-return TaskView;
+        });
 
-});
+        return TaskView;
+
+    });