Improve layout

assigned to @benoit

created branch 20-improve-layout to address this issue

mentioned in merge request !22 (merged)

mentioned in commit 61f44446

closed with merge request !22 (merged)