Tweaks to js + removing href from collapse link