 
             this.editBlock = (block) ->
                 _rollbackStorage[block.$$hashKey] = _.cloneDeep block
-                $scope.blocks[getIdx(block)].editing = yes
+                block.editing = yes
 
             this.submitBlockEdit = (block) ->
-                block = $scope.blocks[getIdx block]
                 block.saved = yes
                 block.editing = no
 
             this.rollbackBlockEdit = (block) ->
-                block = $scope.blocks[getIdx block]
 
                 # If block wasn't previously saved, delete it right away
                 if not block.saved


            this.moveUp = (block) ->
                if block.canMoveUp
                    index = getIdx block

                    if index > 0
                        current = $scope.blocks[index]


            this.moveDown = (block) ->
                if block.canMoveDown
                    index = _.indexOf $scope.blocks, block

                    if index < $scope.blocks.length - 1
                        current = $scope.blocks[index]
