Merge Modify and View Windows in RnD

Issue #931 on hold
Eric B Jones repo owner created an issue

See if we can get a way to merge the windows.