Tweak grid system and a few minor changes