Fixed menu issues