                  [:div.col-md-9
                   [evidence/input {:name "narrative" :rows 5 :cols 40 :atom evidence-narrative-atom } true]]]])
 
-             ]]])
+             ]
+            [:div.add
+             [:button {:type "button"
+                       :class "btn btn-primary"
+                       :disabled (not (url? @evidence-url-atom))
+                       :on-click #(do
+                                    (.preventDefault %)
+                                    (if (= @input-mode :url_input) (reset! (cursor state [:evidence :properties :resource_type] ) "url"))
+                                    (evidence/save-badge-evidence data state init-data)
+                                    (when-not @(cursor state [:evidence :message])(swap! state assoc :tab [settings-tab-content data state init-data]
+                                                                                         :tab-no 2)))}
+              (t :core/Add)]]]])
 
         ;;url input
-        (when (= @input-mode :url_input) [:div
-                                          [:div.col-md-12
-                                           [:div.resource-container {:style {:margin-bottom "10px"}}
-                                            [evidence/input {:name "evidence-url" :atom evidence-url-atom :type "url" :placeholder "http://" :preview? (cursor state [:show-preview])}]]]])
+        (when (= @input-mode :url_input)
+          [:div.preview.evidence-list.col-md-9
+           [:div.panel.panel-default
+            [:div.panel-heading
+             [:div.panel-title
+              [:div.url [:i.fa.fa-link]] [evidence/input {:name "evidence-url" :atom evidence-url-atom :type "url" :placeholder "http://"}]]]
+            [:div.panel-body.evidence-panel-body
+             [:div [:div.form-group
+                    [:label.col-md-3 "Name"]
+                    [:div.col-md-9
+                     [evidence/input {:name "name" :atom evidence-name-atom :type "text"} nil]]]
+              [:div.form-group
+               [:label.col-md-3 (t :page/Description)]
+               [:div.col-md-9
+                [evidence/input {:name "narrative" :rows 5 :cols 40 :atom evidence-narrative-atom } true]]]]]
+            [:div.add
+             [:button {:type "button"
+                       :class "btn btn-primary"
+                       :disabled (not (url? @evidence-url-atom))
+                       :on-click #(do
+                                    (.preventDefault %)
+                                    (reset! (cursor state [:evidence :properties :resource_type] ) "url")
+                                    (evidence/save-badge-evidence data state init-data)
+                                    (when-not @(cursor state [:evidence :message])(swap! state assoc :tab [settings-tab-content data state init-data]
+                                                                                         :tab-no 2)))}
+              (t :core/Add)]]]]
+          #_[:div.resource-container {:style {:margin-bottom "10px"}}
+             [evidence/input {:name "evidence-url" :atom evidence-url-atom :type "url" :placeholder "http://" :preview? (cursor state [:show-preview])}]])
+
         ;;Resource grid
         (when-not @(cursor state [:show-preview])[evidence/resource-input data state init-data])
 
         ;;Buttons
-        [:div.col-md-12
-         [:hr]
-         (when @(cursor state [:show-preview])[:button {:type "button"
-                                                        :class "btn btn-primary"
-                                                        :disabled (not (url? @evidence-url-atom))
-                                                        :on-click #(do
-                                                                     (.preventDefault %)
-                                                                     (if (= @input-mode :url_input) (reset! (cursor state [:evidence :properties :resource_type] ) "url"))
-                                                                     (evidence/save-badge-evidence data state init-data)
-                                                                     (when-not @(cursor state [:evidence :message])(swap! state assoc :tab [settings-tab-content data state init-data]
-                                                                                                                          :tab-no 2)))}
-                                               (t :core/Add)])
-         [:a.cancel {:on-click #(do
-                                  (.preventDefault %)
-                                  (swap! state assoc :tab [settings-tab-content (dissoc data :evidence) state init-data]
-                                         :tab-no 2))}
-          (t :core/Cancel)]]]]]]))
+        #_[:div.col-md-12
+           [:hr]
+           (when @(cursor state [:show-preview])[:button {:type "button"
+                                                          :class "btn btn-primary"
+                                                          :disabled (not (url? @evidence-url-atom))
+                                                          :on-click #(do
+                                                                       (.preventDefault %)
+                                                                       (if (= @input-mode :url_input) (reset! (cursor state [:evidence :properties :resource_type] ) "url"))
+                                                                       (evidence/save-badge-evidence data state init-data)
+                                                                       (when-not @(cursor state [:evidence :message])(swap! state assoc :tab [settings-tab-content data state init-data]
+                                                                                                                            :tab-no 2)))}
+                                                 (t :core/Add)])
+           [:a.cancel {:on-click #(do
+                                    (.preventDefault %)
+                                    (swap! state assoc :tab [settings-tab-content (dissoc data :evidence) state init-data]
+                                           :tab-no 2))}
+            (t :core/Cancel)]]]]]]))
 
 (defn evidence-list [data state init-data]
   (let [evidence-name-atom (cursor state [:evidence :name])


    [:div {:id "badge-settings" :class "row flip"}
     [:div {:class "col-md-3 badge-image modal-left"}
      [:img {:src (str "/" image_file) :alt name}]]
     [:div {:class "col-md-9 settings-content settings-tab"}
      (if @message [:div @message])
      [:div
       [:div.row [:label.col-md-9.sub-heading (t :badge/Addnewevidence)]]
       [:div.evidence-info (t :badge/Evidenceinfo)]

       [:div.row.form-horizontal

                                                   :class "close panel-edit"
                                                   :on-click #(do (.preventDefault %)
                                                                (evidence/init-evidence-form evidence state true))
                                                   :role "button"
                                                   :data-toggle "collapse"
                                                   :data-target (str "#collapse" id)
                                                   :data-parent "#accordion"
                                                   :href (str "#collapse" id)
                                                   :aria-expanded "true"
                                                   ;:aria-controls (str "collapse" id)
                                                   }
                                          [:i.fa.fa-edit.edit-evidence]]];;edit-button

                              [:div [:button {:type "button"
                                              :aria-label "OK"
                                              :class "close"
                                              :data-toggle "collapse"
                                              ;data-target (str "#collapse" id)
                                              :on-click #(do (.preventDefault %)
                                                           (evidence/delete-evidence! id data state init-data))
                                              :aria-expanded "false"
                                              :aria-controls (str "collapse" id)
                                              }
                                     [:i.fa.fa-trash.trash]]] ;;delete-button
                              ])]

                          [:div.panel-collapse {:id (str "collapse" id)
                                                :class "collapse"
                                                :role "tabpanel"
                                                :aria-labelledby (str "heading" id)}
                           [:div.panel-body.evidence-panel-body {:style {:padding-top "10px"}}
                            [:div.form-group
                             [:label.col-md-3 (t :badge/Name)]
