Finished 5.4
Finish layout and routes (~5-5)