filling in layout
Finish layout and routes
master merge layout