Merge branch 'filling-in-layout' into 'master'

Finish layout and routes

See merge request !2
Status Job ID Name Coverage
  Build
failed #1903
build

 
  Test
skipped #1905
allowed to fail
codequality
skipped #1904
test
 
Build build
No job trace