   selectMove: (e) =>
     $this = $(e.currentTarget)
     moveName = $this.data('move-id')
-    type = MoveData[moveName].type.toLowerCase()
     $moves = @getActivePokemonView().find('.selected_moves')
     $input = $moves.find('input').first()
-    $input.replaceWith("""<div class="button move-button #{type}">#{moveName}</div>""")
+    @buttonify($input, moveName)
     $moves.find('input').first().focus()
 
     # Record moves

    $input = $("<input type='text' value='#{$this.text()}'/>")
    $this.replaceWith($input)
    $input.focus()

  setSelectedIndex: (index) =>
    pokemon = @collection.at(index)


    view.html @editTemplate(window: window, speciesList: @speciesList, itemList: @itemList, pokemon: pokemon)
    @renderStats(pokemon)

    @$('.selected_moves input').each (i, el) =>
      $this = $(el)
      moveName = $this.val()
      @buttonify($this, moveName)

  renderModal: =>
    if $('#import-team-modal').length == 0
