Revert "Design A UI Build"

This reverts commit d297a82111d047e602e1c21d8c3135bec604670f.
Checkbox Selection Fix

Resolved issue in which observers watching cellOrConditional checkbox
wouldn't always run. This was done by merging two observers watching
cellOrConditional. Fixed in B, other designs' UIs are not at the point
where this would be an issue--will be sure to propagate change there.