Layout work
Finish layout and routes