gh #220 fixed layout bug (finally)
Merge branch 'hotfix/#220-bugfix'