Cleanup controller
Add more columns to the table view