Improved tab management