Styling changes and restructuring controllers