refactored settings menu, less code