Finishing Chapter 4
Completing layout and renaming routes