Cleanup of some menus, added editor button, added disconnect question