Added table tweaks helper class
Merge conflict fixxx