various layout tweaks and fixes