Editor fixes

Tested this locally and ran the selenium tests with no regressions.  Let's merge this to staging and let @PCF-Testing take a look as well.