DDBEASY 282 - Layout fixes.
Merge remote-tracking branch 'origin/DDBEASY-282' into development