Merge "Update tabs to match last design" into sc-dev