Tweaks for multi tab support