diff --git a/app/assets/stylesheets/_grids.scss b/app/assets/stylesheets/_grids.scss
index 9c03da0ee..8e59bede1 100644
--- a/app/assets/stylesheets/_grids.scss
+++ b/app/assets/stylesheets/_grids.scss
@@ -22,24 +22,30 @@
   @include grid-column(7/8);
 }
 
+%bottom-gutter,
 .bottom-gutter {
+  @extend %contain-floats;
   margin-bottom: $gutter;
   clear: both;
 }
 
 .bottom-gutter-2-3 {
+  @extend %bottom-gutter;
   margin-bottom: $gutter-two-thirds;
 }
 
 .bottom-gutter-1-2 {
+  @extend %bottom-gutter;
   margin-bottom: $gutter-half;
 }
 
 .bottom-gutter-3-2 {
+  @extend %bottom-gutter;
   margin-bottom: $gutter * 3/2;
 }
 
 .bottom-gutter-2 {
+  @extend %bottom-gutter;
   margin-bottom: $gutter * 2;
 }
 
diff --git a/app/assets/stylesheets/components/pill.scss b/app/assets/stylesheets/components/pill.scss
index 3b04ed497..224a56d98 100644
--- a/app/assets/stylesheets/components/pill.scss
+++ b/app/assets/stylesheets/components/pill.scss
@@ -5,6 +5,9 @@
   a,
   span {
     display: block;
+    width: 25%;
+    box-sizing: border-box;
+    float: left;
     padding: 10px;
     flex-grow: 1;
     text-align: left;