diff --git a/docs/button.html b/docs/button.html
index e21602d76..45fa755e9 100755
--- a/docs/button.html
+++ b/docs/button.html
@@ -200,6 +200,9 @@
   <div class="medium ui button">
     Medium
   </div>
+  <div class="large ui button">
+    Large
+  </div>
   <div class="big ui button">
     Big
   </div>
diff --git a/docs/form.html b/docs/form.html
index 355097ae6..083352480 100755
--- a/docs/form.html
+++ b/docs/form.html
@@ -399,7 +399,7 @@
         <input placeholder="Last Name" type="text">
       </div>
     </div>
-    <div class="ui blue submit button">Submit</div>
+    <div class="ui blue small submit button">Submit</div>
   </div>
   <br><br>
   <div class="ui large form segment">
diff --git a/src/modules/ui/shape.js b/src/modules/ui/shape.js
index bd62597a5..c38971f35 100755
--- a/src/modules/ui/shape.js
+++ b/src/modules/ui/shape.js
@@ -89,10 +89,11 @@ $.fn.shape = function(parameters) {
 
         animate: function(propertyObject, callback) {
           module.verbose('Animating box with properties', propertyObject);
-          callback = callback || function() {
+          callback = callback || function(event) {
               module.reset();
               module.set.active();
               $.proxy(settings.onChange, $nextSide)();
+              event.stopImmediatePropagation();
           };
           if(settings.useCSS) {
             module.verbose('Starting CSS animation');
@@ -136,6 +137,7 @@ $.fn.shape = function(parameters) {
           module.debug('Queueing animation of', method);
           $shape
             .one(endTransition, function() {
+              module.debug('Executing queued animation');
               $module.shape(method);
             })
           ;
diff --git a/src/ui/flat/button.css b/src/ui/flat/button.css
index 2d780b980..061ee6d4a 100755
--- a/src/ui/flat/button.css
+++ b/src/ui/flat/button.css
@@ -376,31 +376,36 @@ Red / Negative
 .ui.tiny.button {
   font-size: 11px;
   font-weight: bold;
-  padding: 6px 13px;
+  padding: 8px 15px;
 }
 .ui.small.buttons .button,
 .ui.small.button {
   font-size: 12px;
-  padding: 6px 15px;
+  padding: 10px 20px;
 }
 .ui.medium.buttons .button,
 .ui.medium.button {
   font-size: 14px;
-  padding: 7px 20px;
+  padding: 12px 30px;
+}
+.ui.large.buttons .button,
+.ui.large.button {
+  font-size: 16px;
+  padding: 15px 30px;
 }
 .ui.big.buttons .button,
 .ui.big.button {
-  font-size: 16px;
-  padding: 13px 30px;
+  font-size: 18px;
+  padding: 15px 30px;
 }
 .ui.huge.buttons .button,
 .ui.huge.button {
-  font-size: 18px;
-  padding: 15px 30px;
+  font-size: 20px;
+  padding: 18px 30px;
 }
 .ui.massive.buttons .button,
 .ui.massive.button {
-  padding: 15px 45px;
+  padding: 20px 45px;
 
   font-size: 24px;
   font-weight: bold;