Fix top service element display and duplicated items in Service Element
Contained Tree
clean up