Multiple fixes.

Rejiggered columns, changed some incorrect variables that caused the
page rendering to fail.