               return
 
           # Hide the current question, show the next question
-          @toggle_question(next_question, false)
-          @toggle_question(current_question, true)
+          @hide_question current_question
+          @show_question next_question
 
           @currentQuestionIndex = next_index
+          @_display_form_buttons( @currentQuestionIndex, next_question )
+
           #Start the Geopoint display if geopoint
           #_geopointDisplay()  if form_info.bind isnt `undefined` and form_info.bind.map isnt `undefined`
-
-          @_display_form_buttons( @currentQuestionIndex, next_question )
 
           @
 

              next_index = next_index - group.children.length
              next_question = document.flat_fields[next_index]

          return if not next_question

          #Is this question relevant?  Or, is this question an equation?
          if (next_question.bind and next_question.bind.calculate != null) or not


          return answerJson[question.name]

        show_question: (question) ->
          @toggle_question(question, false)

        hide_question: (question) ->
          @toggle_question(question, true)

        toggle_question: (question, hide) ->
          return false if not question

          if hide
            $('#' + question.name + '_field').hide()
          else
            $('#' + question.name + '_field').show()

          # Hide/show all children in a group
          if question.type is 'group'
            for child in question.children
              @toggle_question( child, hide )

          return true

