Miscellaneous layout tweaks