     fieldsets = @form.find("fieldset")
     fieldsets.addClass("step")
     # prevent submitting the step that happens to be the last fieldset
-    this.setDefaultButtons()
+    this.addDefaultButtons()
     this.addFakeLastStep()
-    this.enableFormwizard() # unless this.formwizardEnabled()
+    this.enableFormwizard()
     this.setCurrentStepField()
-    # TODO: Try this out instead of putting :start first
-    # this.showStep(@wizard.currentStep)
     this.bindEvents()
 
   linkClass: "_ht_link"
 
   buttons: {}
 
-  setDefaultButtons: ($scope = @form.find("fieldset")) ->
+  addDefaultButtons: ($scope = @form.find("fieldset")) ->
     wizard_buttons = '<input type="reset" /><input type="submit" />'
-    $scope.find("div.buttons").html wizard_buttons
+    $scope.find("div.buttons").prepend wizard_buttons
 
   findStep: (stepId) ->
     @form.find("fieldset##{stepId}")


  goToStepId: (stepId) ->
    console.log "Setting up goto #{stepId}"
    this.setHTMeta("next_step", stepId)
    @form.formwizard("next")

  repeatStep: (step) ->

    this.updateSteps()
    @form.formwizard("show", step.name)

  showStep: (stepId) ->
    inputId = "_ht_link_to_#{stepId}"
    this.setHiddenInput "_ht_step_link", stepId, inputId, @linkClass, this.currentStep()

  formwizardEnabled: ->
    @form.formwizard?
