Moved to 23 column grid as specified in style guide, still LOTS of grid related stuff to uncomment