new layout
Added new routes
Finish layout and routes