Tweak collapse javascript and make the toggle buttons a btn-group