Finish layout and routes
master commit
Merge branch 'filling_in_layout' "merge"