#18 Some refactor during editing profile items.