diff --git a/field_slideshow.css b/field_slideshow.css
index 409ec6a..fab1997 100644
--- a/field_slideshow.css
+++ b/field_slideshow.css
@@ -7,6 +7,9 @@
   max-width: 100%;
   height: auto !important;
   width: auto !important;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 .region-content ul.field-slideshow-pager {
diff --git a/field_slideshow.js b/field_slideshow.js
index 80faf3c..d822f51 100644
--- a/field_slideshow.js
+++ b/field_slideshow.js
@@ -1,6 +1,19 @@
 (function($) {
   Drupal.behaviors.field_slideshow = {
     attach: function(context) {
+      // Recalculate height for responsive layouts
+      var rebuild_max_height = function(context) {
+        var max_height = 0;
+        var heights = $('.field-slideshow-slide',context).map(function ()
+        {
+          //return $(this).outerHeight(true);
+          return $(this).height();
+        }).get(),
+        max_height = Math.max.apply(Math, heights);
+        if (max_height > 0) {
+          context.css("height", max_height);
+        }
+      };
 
       for (i in Drupal.settings.field_slideshow) {
         var settings = Drupal.settings.field_slideshow[i],
@@ -11,29 +24,6 @@
         if (!slideshow.hasClass('field-slideshow-processed')) {
           slideshow.addClass('field-slideshow-processed');
 
-          // Add padding if needed
-          var max_outerWidth = 0;
-          var max_outerHeight = 0;
-          $('.field-slideshow-slide img', slideshow).each(function() {
-            $this = $(this);
-            max_outerWidth = Math.max(max_outerWidth, $this.outerWidth(true));
-            max_outerHeight = Math.max(max_outerHeight, $this.outerHeight(true));
-          });
-          $('.field-slideshow-slide a', slideshow).each(function() {
-            $this = $(this);
-            max_outerWidth = Math.max(max_outerWidth, $this.outerWidth(true));
-            max_outerHeight = Math.max(max_outerHeight, $this.outerHeight(true));
-          });
-          $('.field-slideshow-slide', slideshow).each(function() {
-            $this = $(this);
-            max_outerWidth = Math.max(max_outerWidth, $this.outerWidth(true));
-            max_outerHeight = Math.max(max_outerHeight, $this.outerHeight(true));
-          });
-          slideshow.css({
-            'padding-right': (max_outerWidth - parseInt(slideshow.css('width'))) + 'px',
-            'padding-bottom': (max_outerHeight - parseInt(slideshow.css('height'))) + 'px'
-          });
-
           // Add options
           var options = {
             resizing: 0,
@@ -165,19 +155,6 @@
 
       }
 
-      // Recalculate height for responsive layouts
-      var rebuild_max_height = function(context) {
-        var max_height = 0;
-        var heights = $('.field-slideshow-slide',context).map(function ()
-        {
-          return $(this).height();
-        }).get(),
-        max_height = Math.max.apply(Math, heights);
-        if (max_height > 0) {
-          context.css("height", max_height);
-        }
-      };
-
       if (jQuery.isFunction($.fn.imagesLoaded)) {
         $('.field-slideshow').each(function() {
           $('img',this).imagesLoaded(function($images) {