                                 (reset! input-mode nil)
                                 (reset! (cursor state [:show-form]) nil)
                                 (reset! (cursor state [:show-preview]) nil)
-                                (save-badge-evidence data state init-data)
+                                (save-badge-evidence @(cursor state [:badge-settings]) state init-data)
+                                (swap! state assoc :tab [se/settings-tab-content data state init-data]
+                                       :tab-no 2)
 
                                 )}
           (t :core/Add)]

(defn save-badge-evidence [data state init-data]
  (let [{:keys [id name narrative url resource_visibility properties]} (:evidence @state)
        {:keys [resource_type mime_type resource_id]} properties
        badge-id (:id data)
        ;init-settings (first (plugin-fun (session/get :plugins) "modal" "show_settings_dialog"))
        ]
    (swap! state assoc :evidence {:message nil})
    (if (and (not (blank? narrative)) (blank? name))
      (swap! state assoc :evidence {:message [:div.alert.alert-warning [:p (t :badge/Emptynamefield)]]

(defn evidence-list [data state init-data]
  (let [evidence-name-atom (cursor state [:evidence :name])
        evidence-narrative-atom (cursor state [:evidence :narrative])
        visibility-atom (cursor state [:evidence :properties :hidden])]
    (reduce (fn [r evidence]
              (let [{:keys [narrative description name id url mtime ctime properties]} evidence
                    {:keys [resource_id resource_type mime_type hidden]} properties
