adapt layout
refactor routing
Finish layout and routes