Refactored models and views for settings screens.