rework the tab system a bit
rework the tab system a bit