Made some tweaks to the grid system