Update several menu issues