Slight rework of column widgets. Allows cleaner subclassing