Add Collapse option, tweak plot