Refactor the tabs