Adds icon to illustrate open/closed status

Fixes bug in collapse code where extra entries are destroyed