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

Filling in layout

See merge request !4
Status Job ID Name Coverage
  Build
canceled #3647
build

 
  Test
canceled #3649
allowed to fail
codequality

canceled #3648
test