Fixes & added columnClass & cleanup

What do you think about this?
We need this changes in our company.