5.4
Finish layout and routes
fixed a merge conflict