     textFileElement = @getTextFileElement(currentTarget)
     lineHolderElement = @getLineHolder(currentTarget)
     lineContentElement = @getLineContent(currentTarget)
-    lineNumElement = @getLineNum(currentTarget)
-    buttonParentElement = lineNumElement
+    buttonParentElement = @getButtonParent(currentTarget)
 
     return if not @shouldRender e, buttonParentElement
 


  destroy: (e) =>
    return if @isMovingToSameType e
    $(@COMMENT_BUTTON_CLASS, @getLineNum $(e.currentTarget)).remove()
    return

  buildButton: (buttonAttributes) ->

    return hoveredElement if hoveredElement.hasClass @LINE_HOLDER_CLASS
    $(hoveredElement.parent())

  getLineContent: (hoveredElement) ->
    return hoveredElement if hoveredElement.hasClass @LINE_CONTENT_CLASS

    $(hoveredElement).next ".#{@LINE_CONTENT_CLASS}"

  getButtonParent: (hoveredElement) ->
    if @VIEW_TYPE is 'inline'
      return hoveredElement if hoveredElement.hasClass @OLD_LINE_CLASS

      $(hoveredElement).parent().find ".#{@OLD_LINE_CLASS}"
    else
      return hoveredElement if hoveredElement.hasClass @LINE_NUMBER_CLASS

      $(hoveredElement).prev ".#{@LINE_NUMBER_CLASS}"

  isMovingToSameType: (e) ->
    newButtonParent = @getButtonParent($(e.toElement))
    return false unless newButtonParent
    (newButtonParent).is @getButtonParent($(e.currentTarget))

  shouldRender: (e, buttonParentElement) ->
    (!buttonParentElement.hasClass(@EMPTY_CELL_CLASS) and \
