Fixing ESB Graphical Editor issues