Skill layout rework