Refactored settings menus
REMOVED: unused code in settings