refactored code, added column actions