Lots of tweaks for new grid system