Type and grid tweaks