Pull njxaxson's changes
Fix class name and the printing thereof, split button in two, update JS to work with our JS overhaul
Remove an ID we no longer need
Merge pull request #1137 from sarken/issue_3188

3188 Combine fandoms list into single list