Updated modal selectors and event type on displaySettings directive to sync with the updated Popup codes

Also includes initial HTML updates to treatment tab based on new
treatment factors tab mockup

Issue: n/a
Reviewer: Daniel J (post)