Improved application layout
Finish layout and routes