Finish tasks to 5.4
Finish layout and routes