fixed menu issues