Fix issue #927

Improve the layout as reported by @jacquerie.