Fixed menu issue