diff --git a/res/template/fragments/form.html b/res/template/fragments/form.html
index 854b1f5..08e61df 100644
--- a/res/template/fragments/form.html
+++ b/res/template/fragments/form.html
@@ -60,20 +60,18 @@
 				{{if eq .BackLink ""}}
 					<td colspan="2" style="text-align: right;">
 						{{if eq .SubmitRed true}}
-							<input type="submit" value="{{.SubmitLabel}}" class="button_red"/>
+							<input type="submit" value="{{.SubmitLabel}}" class="button_red" style="float: right;"/>
 						{{else}}
-							<input type="submit" value="{{.SubmitLabel}}" class="button_highlight"/>
+							<input type="submit" value="{{.SubmitLabel}}" class="button_highlight" style="float: right;"/>
 						{{end}}
 					</td>
 				{{else}}
-					<td style="text-align: left;">
-							<a href="{{.BackLink}}" class="button button_red"/>Back</a>
-					</td>
-					<td style="text-align: right;">
+					<td colspan="2" style="text-align: left;">
+						<a href="{{.BackLink}}" class="button button_red" style="float: left;"/>Back</a>
 						{{if eq .SubmitRed true}}
-							<input type="submit" value="{{.SubmitLabel}}" class="button_red"/>
+							<input type="submit" value="{{.SubmitLabel}}" class="button_red" style="float: right;"/>
 						{{else}}
-							<input type="submit" value="{{.SubmitLabel}}" class="button_highlight"/>
+							<input type="submit" value="{{.SubmitLabel}}" class="button_highlight" style="float: right"/>
 						{{end}}
 					</td>
 				{{end}}
diff --git a/webcontroller/web_controller.go b/webcontroller/web_controller.go
index 72c90de..c2ee7d7 100644
--- a/webcontroller/web_controller.go
+++ b/webcontroller/web_controller.go
@@ -175,7 +175,7 @@ func (wc *WebController) serveForm(
 				field.EnteredValue = ""
 				td.Form.Fields[i] = field
 			}
-		} else {
+		} else if td.Form.Submitted {
 			w.WriteHeader(http.StatusBadRequest)
 		}