Added seperate controllers for each property editor