Settings window UI refactor