Merged stats/gear tabs, number adjustments