Insert grid system into header

Also cleaned up some indenting