Finish up to 5.3.4
Finish layout and routes