Reworked tabs