refactoring, update layout for settings view