Changes to how the tabs VCs are managed