Added expand collapse feature as well as added improved delete functionality