--- /c/Users/204072199/Documents/roundup-1.6.1/roundup/cgi/templating.py	2019-06-18 19:18:04.000000000 -0600
+++ templating.py	2019-10-06 22:00:04.541021600 -0600
@@ -784,12 +784,12 @@
         if not self.is_edit_ok():
             return ''
 
-        return self.input(type="hidden", name="@csrf",
-                          value=anti_csrf_nonce(self, self._client)) + \
+        return self.input(type="submit", name="submit_button", value=self._(label)) + \
             '\n' + \
             self.input(type="hidden", name="@action", value=action) + \
             '\n' + \
-            self.input(type="submit", name="submit_button", value=self._(label))
+            self.input(type="hidden", name="@csrf",
+                          value=anti_csrf_nonce(self, self._client))
 
     def history(self):
         if not self.is_view_ok():
@@ -924,16 +924,16 @@
 
         Also sneak in the lastactivity and action hidden elements.
         """
-        return self.input(type="hidden", name="@lastactivity",
-            value=self.activity.local(0)) + \
+        return self.input(type="submit", name="submit_button",
+                       value=self._(label)) + \
+            '\n' + \
+            self.input(type="hidden", name="@lastactivity",
+                       value=self.activity.local(0)) + \
             '\n' + \
             self.input(type="hidden", name="@csrf",
                        value=anti_csrf_nonce(self, self._client)) + \
             '\n' + \
-            self.input(type="hidden", name="@action", value=action) + \
-            '\n' + \
-            self.input(type="submit", name="submit_button",
-                       value=self._(label))
+            self.input(type="hidden", name="@action", value=action) 
 
     def journal(self, direction='descending'):
         """ Return a list of HTMLJournalEntry instances.