DDBNEXT-304: Small layout stuff
Merge branch 'DDBNEXT-hla-layoutstuff-2' into develop