add settings navigation and code refactoring