added close button, added collapse class