Refactor and remove unused menu commands
Rename 'OK' button to 'Done' in prefs for consistency