diff --git a/less/register.less b/less/register.less
index 9c889e3..3fd96df 100644
--- a/less/register.less
+++ b/less/register.less
@@ -1,11 +1,12 @@
-.register {
+.page-register-complete {
 	.tos {
 		background: @body-bg;
 		color: @text-color;
-		border: 1px solid @input-border;
-		height: 200px;
+		max-height: 350px;
 		margin-top: 5px;
 		overflow-y: scroll;
 		padding: 15px;
+		font-size: 1.25rem;
+		line-height: 2rem;
 	}
 }
\ No newline at end of file
diff --git a/templates/partials/acceptTos.tpl b/templates/partials/acceptTos.tpl
new file mode 100644
index 0000000..b64acf8
--- /dev/null
+++ b/templates/partials/acceptTos.tpl
@@ -0,0 +1,9 @@
+<div class="form-group">
+	<label for="agree-terms">[[register:terms_of_use]]</label>
+	<div class="tos">{termsOfUse}</div>
+	<div class="checkbox">
+		<label>
+			<input type="checkbox" name="agree-terms" id="agree-terms"> [[register:agree_to_terms_of_use]]
+		</label>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/register.tpl b/templates/register.tpl
index b765616..2076bdd 100644
--- a/templates/register.tpl
+++ b/templates/register.tpl
@@ -65,21 +65,6 @@
 				</div>
 				<!-- END regFormEntry -->
 
-				<!-- IF termsOfUse -->
-				<div class="form-group">
-					<label class="col-lg-4 control-label">&nbsp;</label>
-					<div class="col-lg-8">
-						<hr />
-						<strong>[[register:terms_of_use]]</strong>
-						<div class="tos">{termsOfUse}</div>
-						<div class="checkbox">
-							<label>
-								<input type="checkbox" name="agree-terms" id="agree-terms"> [[register:agree_to_terms_of_use]]
-							</label>
-						</div>
-					</div>
-				</div>
-				<!-- ENDIF termsOfUse -->
 				<div class="form-group">
 					<div class="col-lg-offset-4 col-lg-8">
 						<button class="btn btn-primary btn-lg btn-block" id="register" type="submit">[[register:register_now_button]]</button>
diff --git a/templates/registerComplete.tpl b/templates/registerComplete.tpl
index adad2b5..bacc0ec 100644
--- a/templates/registerComplete.tpl
+++ b/templates/registerComplete.tpl
@@ -5,6 +5,19 @@
 		<p class="lead text-center">
 			[[register:interstitial.intro]]
 		</p>
+
+		<!-- IF errors.length -->
+		<div class="alert alert-warning">
+			<p>
+				[[register:interstitial.errors-found]]
+			</p>
+			<ul>
+				<!-- BEGIN errors -->
+				<li>@value</li>
+				<!-- END errors -->
+			</ul>
+		</div>
+		<!-- ENDIF errors.length -->
 	</div>
 </div>
 
@@ -25,6 +38,10 @@
 		<input type="hidden" name="_csrf" value="{config.csrf_token}" />
 		<div class="col-xs-6 col-xs-offset-3">
 			<button class="btn btn-primary btn-block">Submit</button>
+			<p class="text-center">
+				<br />
+				<a target="_top" href="{config.relative_path}/register/abort">[[register:cancel_registration]]</a>
+			</p>
 		</div>
 	</div>
 </form>
\ No newline at end of file