Resolve "Improve layout"

Benoît Harraultrequested to merge
26-improve-layout into master

Closes #26 (closed)

Edited by Benoît Harrault

Merge request reports