Up to 5.2.1
Finish layout and routes