Change the ordering of the tabs

Reviewer: Cy Casada

Issue: GCP-9511