code cleanup

Change-Id: I11912a2814d0fc5f3574723607b491ae56db1b2d
bug fix - stop editor from setting column when user didn't initiate it

Change-Id: I9082df3d0caa61ec45d706196eb52e6b228fd0cf