NO-JIRA: Merged with heidi's branch.
FLUID-4938: Restyled the toggle to more closely match the wireframe. Added containers to description and checkbos / toggle so it lays out as in the wireframe.