Fixed Menu template support