Grid Sizing Fixes