Cleanup and make add UI simpler and more consistent
Fix enabling and disabling move buttons
Merge pull request #4 from Robert-Nelson/ui-add-cleanup

Ui add cleanup