Changing usages to use Portal tab indexes