Moving conditionals into own section and minor fixes.

* Asana task ID: #6115417777900