Minor changes

- Added the move Item functionality
- Some minor code cleanup