diff --git a/javascript/UserForm.js b/javascript/UserForm.js
index 26bb719..1aca9c1 100644
--- a/javascript/UserForm.js
+++ b/javascript/UserForm.js
@@ -431,6 +431,14 @@ jQuery(function ($) {
 				buttonOffset = -1 * ($button.innerWidth() / 2);
 
 			$button.css({left: leftPercent, marginLeft: buttonOffset});
+
+			// First and last buttons are kept within userform-progress container
+			if (index === self.$jsAlign.length - 1) {
+				$button.css({marginLeft: buttonOffset * 2});
+			} else if (index === 0) {
+				$button.css({marginLeft: 0});
+			}
+
 		});
 
 		this.update(1);