Small changes to allow the creation of new, indexed tabs