ready for begining 5.4.1
Finish layout and routes
Merge branch 'feature/filling-in-layout' into develop