Improve layout
Finish layout and routes