Re-organize and updated "skills"