completed through 5.3
Finish layout and routes