Worked on authorization. Modified layout. Renamed some controllers
Worked on layout and UI
Worked on UI more; refactored some
Cleaned up
Merged