Fixed expand/collpase
Got add/remove behavior working