UI Interactions for edit mode need improvement

[watcherdm]

Modal should act as modal and only capture clicks that do not trigger other events (content editor).