Updated routing and layout
Finish layout and routes