Tab system refactor