Fix issue #927

Improve the layout as reported by @jacquerie.
Merge pull request #928 from jacquerie/issue-927

Fix issue #927