Updating application layout
Finish layout and routes