Some more cleanup and adding the template of the settings screen.