Even more MVC separation, starting to look good. Still need to fully implement the new night button, and a way back from the settings screen.