Layout

Merged Johannes requested to merge layout into master

Merge request reports