Some more work on tab management