Cleanup some menu issues