Rework the tabs, should be clearer