Overhauled tab management