Form grid structure tweaks