          #_[block-type block-atom]]
         [:div {:class "col-xs-4 field-remove"
                :on-click #(f/remove-field blocks index)}
+         [:span.move-block  [:i.fa.fa-arrows]]
          [:span {:class "remove-button" :title (t :page/Delete)}
           [:i {:class "fa fa-trash"}]]]]
        (case type
          ("heading" "sub-heading") [edit-block-text block-atom]
-         ("badge") [edit-block-badges block-atom badges]
+         ("badge") [badge-block block-atom]#_[edit-block-badges block-atom badges]
          ("tag") [edit-block-badge-groups block-atom tags badges]
          ("file") [edit-block-files block-atom files]
          ("html") [edit-block-html block-atom]

     [:div {:class "col-xs-4 badge-image"}
      (if image
        [:img {:src (str "/" image)}])]]))

(defn edit-block-badge-groups [block-atom tags badges]
  (let [tag (get-in @block-atom [:tag] "")

        format (:format @block-atom)]
    [:div.form-group
     [:div.col-xs-8
      [:div.badge-select
       [:select {:class "form-control"
                 :aria-label "select badge group"
                 :value badge-id
