Update for some menu fixes for consistency