merged gallery editor (sidebar) into current version