Code cleanup in Controller. Fixed bug where moved item would not be removed from view.