5.4.2 - 5.5 Finish layout and routes