Revised layout
Finish layout and routes