Finish layout and routes part 1
Finish layout and routes