Refactored some UI code and included column types.