Fixing the layout
Finish layout and routes
Finish layout and routes