More screenreader friendly Collapse, Take 2

BS3 commits: 28582080385ab8ade3949644b36794335a4ba80d

Update placeholders