Rejig of discussion switches

Putting them in their relevant places.
CC @chrisfinch as he will need to know where his switches have gone.

---

![Switches!](http://media.giphy.com/media/123M8hJtXxQNmo/giphy.gif)