Building the layout
modified routing
Finish layout and routes