A few more grid tweaks.
Fixing minor conflict.