Finished layout and routes
Merge branch 'User-Controller-and-Models'