Rework on the skill UI and skill input