grid system and a bunch of other changes