Tweaks and made expand/collapse icon match expand/collapse text.