Started work on default theme and started to tidy up the controllers.