           }
         </div>
       }
-      <div>
-        <label>Question Formats</label>
-      </div>
-      <div>
-        <input onChange={@multipleChoiceClicked}
-          id="multipleChoiceFormat#{id}"
-          type="checkbox"
-          defaultChecked={QuestionStore.isMultipleChoice(id)} />
-        <label htmlFor="multipleChoiceFormat#{id}">Multiple Choice</label>
-      </div>
-      <div>
-        <input onChange={@freeResponseClicked}
-          id="freeResponseFormat#{id}"
-          type="checkbox"
-          defaultChecked={QuestionStore.isFreeResponse(id)}
-        /> <label htmlFor="freeResponseFormat#{id}">Requires viewing choices to answer question</label>
-      </div>
+      <QuestionFormatType questionId={id} />
+
+      <BS.Input type="checkbox" label="Order Matters"
+        onChange={@preserveOrderClicked}
+        checked={QuestionStore.isOrderPreserved(id)} />
+
       <div>
         <label>Question Stem</label>
         <textarea onChange={@updateStem} defaultValue={QuestionStore.getStem(id)}></textarea>
-      </div>
-      <div>
-        <label>Detailed Solution</label>
-        <textarea onChange={@updateSolution} defaultValue={QuestionStore.getSolution(id)}></textarea>
       </div>
       <div>
         <label>
           Answers:
         </label>
         <a className="pull-right" onClick={@addAnswer}>Add New</a>
-        <p>
-          <input onChange={@preserveOrderClicked}
-            id="preserveOrder#{id}"
-            type="checkbox"
-            defaultChecked={QuestionStore.isOrderPreserved(id)}
-          /> <label htmlFor="preserveOrder#{id}">Order Matters</label>
-        </p>
         <ol>
           {answers}
         </ol>
       </div>
+      <div>
+        <label>Detailed Solution</label>
+        <textarea onChange={@updateSolution} defaultValue={QuestionStore.getSolution(id)}></textarea>
+      </div>
     </div>

React = require 'react'
_ = require 'underscore'

Answer = require './answer'
{QuestionActions, QuestionStore} = require '../stores/question'
{AnswerActions, AnswerStore} = require '../stores/answer'


  render: ->
    { id, removeQuestion, moveQuestion, canMoveLeft, canMoveRight } = @props

    answers = []

    for answer, index in QuestionStore.getAnswers(id)
