Added layouts
Finish layout and routes