Updated navigation menus to be more inline with VPCM