Updating header and unitbar to more closely mirror VPCM guidelines