Redo grid to make sm columns 12 instead of 4 in addition to a couple of other housekeeping items