diff --git a/application/views/edit_course.xhtml b/application/views/edit_course.xhtml
index 4fc7d4c1644c40b400d7ff234f364b1550112ee6..21a932dfa648894b3cf1895467a0f118766a9403 100644
--- a/application/views/edit_course.xhtml
+++ b/application/views/edit_course.xhtml
@@ -9,87 +9,169 @@
 <fieldset>
     <fieldset class="three_column">
         <label>
-            Title<br />
-            <input type="text" id="title" name="title" value="<?php echo htmlentities($this->course->title); ?>" />
+            Subject<br />
+            <input type="text" id="subject" name="subject" value="<?php echo htmlentities($this->course->subject); ?>" />
         </label>
         <label>
-            Integrated Studies
-            <input type="hidden" name="integratedStudies" value="no" />
-            <input type="checkbox"
-                   name="integratedStudies"
-                   value="yes"
-                   <?php if($this->course->integratedStudies == 'yes') { ?>
+            Course Number<br />
+            <input type="text" id="courseNumber" name="courseNumber" value="<?php echo htmlentities($this->course->courseNumber); ?>" />
+        </label>
+        <label>
+            Course Letter
+            <input type="text" id="courseLetter" name="courseLetter" value="<?php echo htmlentities($this->course->courseLetter); ?>" />
+        </label>
+    </fieldset>
+
+    <h3>Grading</h3>
+    <fieldset class="three_column">
+        <label>
+            Unrestricted
+            <input type="radio"
+                   class="radio"
+                   name="gradingType"
+                   value="unrestricted"
+                   <?php if($this->course->gradingType == 'unrestricted') { ?>
                    checked="checked"
                    <?php } ?>
-            />
+                   />
+        </label>
+
+        <label>
+            Letter Grade Only
+            <input type="radio"
+                   class="radio"
+                   name="gradingType"
+                   value="letter grade only"
+                   <?php if($this->course->gradingType == 'letter grade only') { ?>
+                   checked="checked"
+                   <?php } ?>
+                   />
+        </label>
+        <label>
+            Pass / No Pass Only
+            <input type="radio"
+                   class="radio"
+                   name="gradingType"
+                   value="pass/no pass only"
+                   <?php if($this->course->gradingType == 'pass/no pass only') { ?>
+                   checked="checked"
+                   <?php } ?>
+                   />
         </label>
     </fieldset>
 
+    <h3>Delivery Method(s)</h3>
     <fieldset class="three_column">
         <label>
-            Subject<br />
-            <input type="text" id="subject" name="subject" value="<?php echo htmlentities($this->course->subject); ?>" />
+            Classroom
+            <input type="checkbox"
+                   name="deliveryMethods[]"
+                   value="Classroom"
+                   <?php if(in_array('Classroom', $this->course->deliveryMethods)) { ?>
+                   checked="checked"
+                   <?php } ?>
+                   />
         </label>
         <label>
-            Course Number<br />
-            <input type="text" id="courseNumber" name="courseNumber" value="<?php echo htmlentities($this->course->courseNumber); ?>" />
+            Web
+            <input type="checkbox"
+                   name="deliveryMethods[]"
+                   value="Web"
+                   <?php if(in_array('Web', $this->course->deliveryMethods)) { ?>
+                   checked="checked"
+                   <?php } ?>
+                   />
         </label>
         <label>
-            Course Letter
-            <input type="text" id="courseLetter" name="courseLetter" value="<?php echo htmlentities($this->course->courseLetter); ?>" />
+            Correspondence
+            <input type="checkbox"
+                   name="deliveryMethods[]"
+                   value="Correspondence"
+                   <?php if(in_array('Correspondence', $this->course->deliveryMethods)) { ?>
+                   checked="checked"
+                   <?php } ?>
+                   />
         </label>
     </fieldset>
-</fieldset>
-
-<h2>Grading</h2>
-<fieldset class="three_column">
-    <label>
-        Unrestricted
-        <input type="radio"
-               class="radio"
-               name="gradingType"
-               value="unrestricted"
-               <?php if($this->course->gradingType == 'unrestricted') { ?>
-               checked="checked"
-               <?php } ?>
-               />
-    </label>
 
-    <label>
-        Letter Grade Only
-        <input type="radio"
-               class="radio"
-               name="gradingType"
-               value="letter grade only"
-               <?php if($this->course->gradingType == 'letter grade only') { ?>
-               checked="checked"
-               <?php } ?>
-               />
-    </label>
-    <label>
-        Pass / No Pass Only
-        <input type="radio"
-               class="radio"
-               name="gradingType"
-               value="pass/no pass only"
-               <?php if($this->course->gradingType == 'pass/no pass only') { ?>
-               checked="checked"
-               <?php } ?>
-               />
-    </label>
+    <fieldset class="three_column">
+        <label>
+            Title<br />
+            <input type="text" id="title" name="title" value="<?php echo htmlentities($this->course->title); ?>" />
+        </label>
+        <label>
+            Integrated Studies
+            <input type="hidden" name="integratedStudies" value="no" />
+            <input type="checkbox"
+                   name="integratedStudies"
+                   value="yes"
+                   <?php if($this->course->integratedStudies == 'yes') { ?>
+                   checked="checked"
+                   <?php } ?>
+            />
+        </label>
+    </fieldset>
 </fieldset>
 
-<h2>Prerequisite</h2>
-<fieldset>
-    <textarea id="prerequisite" name="prerequisite"><?php echo htmlentities($this->course->prerequisite); ?></textarea>
-</fieldset>
-<h2>Notes</h2>
-<fieldset>
-    <textarea id="notes" name="notes"><?php echo htmlentities($this->course->notes); ?></textarea>
-</fieldset>
-<h2>Description</h2>
-<fieldset>
-    <textarea id="description" name="description"><?php echo htmlentities($this->course->description); ?></textarea>
+<h2>Crosslistings</h2>
+<fieldset class="three_column">
+    <table>
+        <tr>
+            <th>Subject</th>
+            <th>Course Number</th>
+            <th>Course Letter</th>
+            <th>Remove</th>
+        </tr>
+        <?php $hasTieIn = false;
+        foreach($this->course->crosslistings as $key => $crosslist) {
+            if($crosslist->type == 'grad tie-in') { $hasTieIn = true; }
+            if($crosslist->type != 'home listing') { ?>
+        <tr <?php if($crosslist->type == 'grad tie-in') { ?>class="grad_tie_in_row"<?php } ?>>
+            <td> <input type="text"
+                        name="crosslistings[<?php echo $key; ?>][subject]"
+                        value="<?php echo $crosslist->subject; ?>"
+                        <?php if($crosslist->type == 'grad tie-in') { ?>readonly=""<?php } ?>/> </td>
+            <td> <input type="text"
+                        name="crosslistings[<?php echo $key; ?>][courseNumber]"
+                        value="<?php echo $crosslist->courseNumber; ?>"
+                        <?php if($crosslist->type == 'grad tie-in') { ?>readonly=""<?php } ?> /> </td>
+            <td> <input type="text"
+                        name="crosslistings[<?php echo $key; ?>][courseLetter]"
+                        value="<?php echo $crosslist->courseLetter; ?>"
+                        <?php if($crosslist->type == 'grad tie-in') { ?>readonly=""<?php } ?> /> </td>
+            <td class="hidden">
+                <input type="hidden"
+                       name="crosslistings[<?php echo $key; ?>][type]"
+                       value="<?php echo $crosslist->type; ?>" />
+            </td>
+            <td> <input type="checkbox"
+                        name="crosslistings[<?php echo $key; ?>][delete]"
+                        value="yes" /> </td>
+        </tr>
+        <?php } } ?>
+        <tr class="hidden_new_record">
+            <td> <input disabled="disabled" type="text" name="crosslistings[__key__][subject]" /> </td>
+            <td> <input disabled="disabled" type="text" name="crosslistings[__key__][courseNumber]" /> </td>
+            <td> <input disabled="disabled" type="text" name="crosslistings[__key__][courseLetter]" /> </td>
+            <td class="hidden"> <input disabled="disabled" type="hidden" name="crosslistings[__key__][type]" value="crosslisting" /> </td>
+            <td> <a href="#" class="remove_record_button">-</a> </td>
+        </tr>
+        <tr>
+            <td colspan="4">
+                <a href="#" class="add_record_button">Add Crosslisting</a>
+                <?php if(!$hasTieIn) { ?>
+                <a href="#"
+                   class="add_record_button"
+                   id="add_tie_in_button_<?php echo $this->course->subject
+                                                  . '_' . $this->course->courseNumber
+                                                  . '_' . $this->course->courseLetter; ?>"
+                >
+                    Add Graduate Tie-In
+                </a>
+                <?php } ?>
+            </td>
+        </tr>
+    </table>
 </fieldset>
 
 <h2>Credit (leave blank if not defined)</h2>
@@ -130,6 +212,40 @@
     </div>
 </fieldset>
 
+<h2>Terms Offered (Remove terms never taught)</h2>
+<fieldset class="three_column">
+    <label>
+        Fall
+        <input type="checkbox"
+               name="termsOffered[]"
+               value="Fall"
+               <?php if(in_array('Fall', $this->course->termsOffered)) { ?>
+               checked="checked"
+               <?php } ?>
+               />
+    </label>
+    <label>
+        Spring
+        <input type="checkbox"
+               name="termsOffered[]"
+               value="Spring"
+               <?php if(in_array('Spring', $this->course->termsOffered)) { ?>
+               checked="checked"
+               <?php } ?>
+               />
+    </label>
+    <label>
+        Summer
+        <input type="checkbox"
+               name="termsOffered[]"
+               value="Summer"
+               <?php if(in_array('Summer', $this->course->termsOffered)) { ?>
+               checked="checked"
+               <?php } ?>
+               />
+    </label>
+</fieldset>
+
 <h2>Activity</h2>
 <fieldset class="two_of_three_column">
     <table>
@@ -202,6 +318,19 @@
     </table>
 </fieldset>
 
+<h2>Prerequisite</h2>
+<fieldset>
+    <textarea id="prerequisite" name="prerequisite"><?php echo htmlentities($this->course->prerequisite); ?></textarea>
+</fieldset>
+<h2>Notes</h2>
+<fieldset>
+    <textarea id="notes" name="notes"><?php echo htmlentities($this->course->notes); ?></textarea>
+</fieldset>
+<h2>Description</h2>
+<fieldset>
+    <textarea id="description" name="description"><?php echo htmlentities($this->course->description); ?></textarea>
+</fieldset>
+
 <h2>Campus(es)</h2>
 <fieldset class="three_column">
     <label>
@@ -246,67 +375,6 @@
     </label>
 </fieldset>
 
-<h2>Crosslistings</h2>
-<fieldset class="three_column">
-    <table>
-        <tr>
-            <th>Subject</th>
-            <th>Course Number</th>
-            <th>Course Letter</th>
-            <th>Remove</th>
-        </tr>
-        <?php $hasTieIn = false;
-        foreach($this->course->crosslistings as $key => $crosslist) {
-            if($crosslist->type == 'grad tie-in') { $hasTieIn = true; }
-            if($crosslist->type != 'home listing') { ?>
-        <tr <?php if($crosslist->type == 'grad tie-in') { ?>class="grad_tie_in_row"<?php } ?>>
-            <td> <input type="text"
-                        name="crosslistings[<?php echo $key; ?>][subject]"
-                        value="<?php echo $crosslist->subject; ?>"
-                        <?php if($crosslist->type == 'grad tie-in') { ?>readonly=""<?php } ?>/> </td>
-            <td> <input type="text"
-                        name="crosslistings[<?php echo $key; ?>][courseNumber]"
-                        value="<?php echo $crosslist->courseNumber; ?>"
-                        <?php if($crosslist->type == 'grad tie-in') { ?>readonly=""<?php } ?> /> </td>
-            <td> <input type="text"
-                        name="crosslistings[<?php echo $key; ?>][courseLetter]"
-                        value="<?php echo $crosslist->courseLetter; ?>"
-                        <?php if($crosslist->type == 'grad tie-in') { ?>readonly=""<?php } ?> /> </td>
-            <td class="hidden">
-                <input type="hidden"
-                       name="crosslistings[<?php echo $key; ?>][type]"
-                       value="<?php echo $crosslist->type; ?>" />
-            </td>
-            <td> <input type="checkbox"
-                        name="crosslistings[<?php echo $key; ?>][delete]"
-                        value="yes" /> </td>
-        </tr>
-        <?php } } ?>
-        <tr class="hidden_new_record">
-            <td> <input disabled="disabled" type="text" name="crosslistings[__key__][subject]" /> </td>
-            <td> <input disabled="disabled" type="text" name="crosslistings[__key__][courseNumber]" /> </td>
-            <td> <input disabled="disabled" type="text" name="crosslistings[__key__][courseLetter]" /> </td>
-            <td class="hidden"> <input disabled="disabled" type="hidden" name="crosslistings[__key__][type]" value="crosslisting" /> </td>
-            <td> <a href="#" class="remove_record_button">-</a> </td>
-        </tr>
-        <tr>
-            <td colspan="4">
-                <a href="#" class="add_record_button">Add Crosslisting</a>
-                <?php if(!$hasTieIn) { ?>
-                <a href="#"
-                   class="add_record_button"
-                   id="add_tie_in_button_<?php echo $this->course->subject
-                                                  . '_' . $this->course->courseNumber
-                                                  . '_' . $this->course->courseLetter; ?>"
-                >
-                    Add Graduate Tie-In
-                </a>
-                <?php } ?>
-            </td>
-        </tr>
-    </table>
-</fieldset>
-
 <h2>Graduate Tie-In</h2>
 <fieldset>
     <label>
@@ -323,40 +391,6 @@
     </label>
 </fieldset>
 
-<h2>Delivery Method(s)</h2>
-<fieldset class="three_column">
-    <label>
-        Classroom
-        <input type="checkbox"
-               name="deliveryMethods[]"
-               value="Classroom"
-               <?php if(in_array('Classroom', $this->course->deliveryMethods)) { ?>
-               checked="checked"
-               <?php } ?>
-               />
-    </label>
-    <label>
-        Web
-        <input type="checkbox"
-               name="deliveryMethods[]"
-               value="Web"
-               <?php if(in_array('Web', $this->course->deliveryMethods)) { ?>
-               checked="checked"
-               <?php } ?>
-               />
-    </label>
-    <label>
-        Correspondence
-        <input type="checkbox"
-               name="deliveryMethods[]"
-               value="Correspondence"
-               <?php if(in_array('Correspondence', $this->course->deliveryMethods)) { ?>
-               checked="checked"
-               <?php } ?>
-               />
-    </label>
-</fieldset>
-
 <?php /*
 <h2>DF Removals (not implemented)</h2>
 <table>
@@ -414,40 +448,6 @@
     <?php } ?>
 </table> */ ?>
 
-<h2>Terms Offered (Remove terms never taught)</h2>
-<fieldset class="three_column">
-    <label>
-        Fall
-        <input type="checkbox"
-               name="termsOffered[]"
-               value="Fall"
-               <?php if(in_array('Fall', $this->course->termsOffered)) { ?>
-               checked="checked"
-               <?php } ?>
-               />
-    </label>
-    <label>
-        Spring
-        <input type="checkbox"
-               name="termsOffered[]"
-               value="Spring"
-               <?php if(in_array('Spring', $this->course->termsOffered)) { ?>
-               checked="checked"
-               <?php } ?>
-               />
-    </label>
-    <label>
-        Summer
-        <input type="checkbox"
-               name="termsOffered[]"
-               value="Summer"
-               <?php if(in_array('Summer', $this->course->termsOffered)) { ?>
-               checked="checked"
-               <?php } ?>
-               />
-    </label>
-</fieldset>
-
 <input type="submit" />
 
 </form>