layout tweaks #30