More layout work and add Dashboards controller.