fix layouts
Finish layout and routes