Added layouts and routes
Finish layout and routes