Edit Remote bug fix.
Adjustments to delivery GUI.

fixes #7710