Draft: Resolve "Improve layout"

Open Benoît Harrault requested to merge 12-improve-layout into master

Closes #12

Merge request reports