Improve layouts
Finish layout and routes