"Extra" sections would show at the bottom of their parent section rather than being fully independent.

Also move all the stuff out of Situational into the appropriate Extra categories; Situational is where I was putting early features that shouldn't be on by default before we started just tossing them wherever.

This should make the behavior of profiles much more predictable and surface "weird" features more obviously.