Misc column layout changes

Redo form widget positioning to always be at top of column. Add column labels.