Feature/ddf 670 v3

Mostly peer review comment fixes and UI tweaks.