Fixing Initial Layout Prollems

These commits fix the initial layout problem where columns in the body don't match the width of the header. They also remove some horrifying duplication.

:shipit: