various layout tweaks per issue #29