Possible improvement of tab management?