Table tabs refactoring