Fixed add/edit subskill
Manual merge of Nikhil's changes