Fix layout
Merge branch 'feature-layout' into dev