:bowtie: a bit improvement in the layout