Refactor Tabs