Adding layout
Finish layout and routes