SkillMenu refactor done