Tabs refactor