Tab container refactoring