Issue #7 and bug fixes

...ug that caused editor and panel to be in different scopes