fix issue #6 - some more layout tweaks