More housekeeping as we update the grid system