settings menu refactoring