diff --git a/src/Modal/__tests__/__snapshots__/Dialog-test.js.snap b/src/Modal/__tests__/__snapshots__/Dialog-test.js.snap
index 3727f52c..a12e3d38 100644
--- a/src/Modal/__tests__/__snapshots__/Dialog-test.js.snap
+++ b/src/Modal/__tests__/__snapshots__/Dialog-test.js.snap
@@ -11,6 +11,10 @@ exports[`Dialog renders correctly 1`] = `
   />
   
   
-  Lorem Ipsum
+  <div
+    className="uk-modal-body"
+  >
+    Lorem Ipsum
+  </div>
 </div>
 `;
diff --git a/src/Modal/__tests__/__snapshots__/index-test.js.snap b/src/Modal/__tests__/__snapshots__/index-test.js.snap
index c69c7837..24cc6109 100644
--- a/src/Modal/__tests__/__snapshots__/index-test.js.snap
+++ b/src/Modal/__tests__/__snapshots__/index-test.js.snap
@@ -34,28 +34,32 @@ exports[`Modal renders a Blank Modal 1`] = `
       
       
       <div
-        className="uk-grid uk-flex-middle"
+        className="uk-modal-body"
       >
         <div
-          className="uk-width-medium-1-2 uk-height-viewport uk-cover-background uk-row-first"
-          style={
-            Object {
-              "backgroundImage": "url(http://getuikit.com/docs/images/placeholder_120x255.svg)",
-            }
-          }
-        />
-        <div
-          className="uk-width-medium-1-2"
+          className="uk-grid uk-flex-middle"
         >
-          <h1>
-            Headline
-          </h1>
           <div
-            className="uk-width-medium-1-3"
+            className="uk-width-medium-1-2 uk-height-viewport uk-cover-background uk-row-first"
+            style={
+              Object {
+                "backgroundImage": "url(http://getuikit.com/docs/images/placeholder_120x255.svg)",
+              }
+            }
+          />
+          <div
+            className="uk-width-medium-1-2"
           >
-            <p>
-              Lorem ipsum
-            </p>
+            <h1>
+              Headline
+            </h1>
+            <div
+              className="uk-width-medium-1-3"
+            >
+              <p>
+                Lorem ipsum
+              </p>
+            </div>
           </div>
         </div>
       </div>
@@ -101,7 +105,11 @@ exports[`Modal renders a Caption 1`] = `
       >
         Caption
       </div>
-      Lorem ipsum
+      <div
+        className="uk-modal-body"
+      >
+        Lorem ipsum
+      </div>
     </div>
   </div>
 </Portal>
@@ -146,7 +154,11 @@ exports[`Modal renders a Header and Footer 1`] = `
         </h2>
       </div>
       
-      Lorem ipsum
+      <div
+        className="uk-modal-body"
+      >
+        Lorem ipsum
+      </div>
       <div
         className="uk-modal-footer uk-text-right"
       >
@@ -194,11 +206,15 @@ exports[`Modal renders a Lightbox 1`] = `
       />
       
       
-      <img
-        alt=""
-        role="presentation"
-        src="http://getuikit.com/docs/images/placeholder_600x400.svg"
-      />
+      <div
+        className="uk-modal-body"
+      >
+        <img
+          alt=""
+          role="presentation"
+          src="http://getuikit.com/docs/images/placeholder_600x400.svg"
+        />
+      </div>
     </div>
   </div>
 </Portal>
@@ -234,8 +250,12 @@ exports[`Modal renders a Spinner 1`] = `
       
       
       <div
-        className="uk-modal-spinner"
-      />
+        className="uk-modal-body"
+      >
+        <div
+          className="uk-modal-spinner"
+        />
+      </div>
     </div>
   </div>
 </Portal>
@@ -270,7 +290,11 @@ exports[`Modal renders an alert modal 1`] = `
     >
       
       
-      Something bad happened!
+      <div
+        className="uk-modal-body"
+      >
+        Something bad happened!
+      </div>
       <div
         className="uk-modal-footer uk-text-right"
       >
@@ -316,7 +340,11 @@ exports[`Modal renders an confirm modal 1`] = `
     >
       
       
-      Are you absolutely sure about this?
+      <div
+        className="uk-modal-body"
+      >
+        Are you absolutely sure about this?
+      </div>
       <div
         className="uk-modal-footer uk-text-right"
       >
@@ -373,14 +401,18 @@ exports[`Modal renders an prompt modal 1`] = `
       
       
       <div
-        className="uk-margin-small-top uk-modal-content uk-form"
+        className="uk-modal-body"
       >
-        <p>
-          <input
-            className="uk-width-1-1"
-            type="text"
-          />
-        </p>
+        <div
+          className="uk-margin-small-top uk-modal-content uk-form"
+        >
+          <p>
+            <input
+              className="uk-width-1-1"
+              type="text"
+            />
+          </p>
+        </div>
       </div>
       <div
         className="uk-modal-footer uk-text-right"
@@ -441,7 +473,11 @@ exports[`Modal renders correctly 1`] = `
       />
       
       
-      Lorem ipsum
+      <div
+        className="uk-modal-body"
+      >
+        Lorem ipsum
+      </div>
     </div>
   </div>
 </Portal>
diff --git a/src/__tests__/__snapshots__/Dropdown-test.js.snap b/src/__tests__/__snapshots__/Dropdown-test.js.snap
index 6d7638da..7b700912 100644
--- a/src/__tests__/__snapshots__/Dropdown-test.js.snap
+++ b/src/__tests__/__snapshots__/Dropdown-test.js.snap
@@ -4,7 +4,7 @@ exports[`Dropdown changes the class when clicked 1`] = `
 <div
   aria-expanded={false}
   aria-haspopup={true}
-  className="uk-button-dropdown"
+  className="uk-inline"
   onClick={[Function]}
   onMouseEnter={false}
   onMouseLeave={false}
@@ -24,7 +24,7 @@ exports[`Dropdown changes the class when clicked 2`] = `
 <div
   aria-expanded={true}
   aria-haspopup={true}
-  className="uk-button-dropdown uk-open"
+  className="uk-inline uk-open"
   onClick={[Function]}
   onMouseEnter={false}
   onMouseLeave={false}
@@ -44,7 +44,7 @@ exports[`Dropdown changes the class when clicked 3`] = `
 <div
   aria-expanded={false}
   aria-haspopup={true}
-  className="uk-button-dropdown"
+  className="uk-inline"
   onClick={[Function]}
   onMouseEnter={false}
   onMouseLeave={false}
@@ -64,7 +64,7 @@ exports[`Dropdown changes the class when hovered 1`] = `
 <div
   aria-expanded={false}
   aria-haspopup={true}
-  className="uk-button-dropdown"
+  className="uk-inline"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -84,7 +84,7 @@ exports[`Dropdown changes the class when hovered 2`] = `
 <div
   aria-expanded={true}
   aria-haspopup={true}
-  className="uk-button-dropdown uk-open"
+  className="uk-inline uk-open"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -104,7 +104,7 @@ exports[`Dropdown changes the class when hovered 3`] = `
 <div
   aria-expanded={true}
   aria-haspopup={true}
-  className="uk-button-dropdown uk-open"
+  className="uk-inline uk-open"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -124,7 +124,7 @@ exports[`Dropdown changes the class when hovered 4`] = `
 <div
   aria-expanded={false}
   aria-haspopup={true}
-  className="uk-button-dropdown"
+  className="uk-inline"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -144,7 +144,7 @@ exports[`Dropdown changes the class when hovered 5`] = `
 <div
   aria-expanded={true}
   aria-haspopup={true}
-  className="uk-button-dropdown uk-open"
+  className="uk-inline uk-open"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -164,7 +164,7 @@ exports[`Dropdown changes the class when hovered 6`] = `
 <div
   aria-expanded={true}
   aria-haspopup={true}
-  className="uk-button-dropdown uk-open"
+  className="uk-inline uk-open"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -184,7 +184,7 @@ exports[`Dropdown closes sibling Dropdown on open 1`] = `
 <div
   aria-expanded={false}
   aria-haspopup={true}
-  className="uk-button-dropdown"
+  className="uk-inline"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -204,7 +204,7 @@ exports[`Dropdown closes sibling Dropdown on open 2`] = `
 <div
   aria-expanded={true}
   aria-haspopup={true}
-  className="uk-button-dropdown uk-open"
+  className="uk-inline uk-open"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -224,7 +224,7 @@ exports[`Dropdown closes sibling Dropdown on open 3`] = `
 <div
   aria-expanded={false}
   aria-haspopup={true}
-  className="uk-button-dropdown"
+  className="uk-inline"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -244,7 +244,7 @@ exports[`Dropdown closes when clicked when in hover mode 1`] = `
 <div
   aria-expanded={true}
   aria-haspopup={true}
-  className="uk-button-dropdown uk-open"
+  className="uk-inline uk-open"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -264,7 +264,7 @@ exports[`Dropdown closes when clicked when in hover mode 2`] = `
 <div
   aria-expanded={false}
   aria-haspopup={true}
-  className="uk-button-dropdown"
+  className="uk-inline"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -284,7 +284,7 @@ exports[`Dropdown closes when clicked when in hover mode 3`] = `
 <div
   aria-expanded={false}
   aria-haspopup={true}
-  className="uk-button-dropdown"
+  className="uk-inline"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -304,7 +304,7 @@ exports[`Dropdown renders correctly 1`] = `
 <div
   aria-expanded={false}
   aria-haspopup={true}
-  className="uk-button-dropdown"
+  className="uk-inline"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -342,7 +342,7 @@ exports[`should be closed 1`] = `
 <div
   aria-expanded={false}
   aria-haspopup={true}
-  className="uk-button-dropdown"
+  className="uk-inline"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
@@ -362,7 +362,7 @@ exports[`should be open 1`] = `
 <div
   aria-expanded={true}
   aria-haspopup={true}
-  className="uk-button-dropdown uk-open"
+  className="uk-inline uk-open"
   onClick={[Function]}
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
diff --git a/src/__tests__/__snapshots__/Input-test.js.snap b/src/__tests__/__snapshots__/Input-test.js.snap
index c059cccc..7677660b 100644
--- a/src/__tests__/__snapshots__/Input-test.js.snap
+++ b/src/__tests__/__snapshots__/Input-test.js.snap
@@ -2,74 +2,74 @@
 
 exports[`Input renders correctly 1`] = `
 <input
-  className=""
+  className="uk-input "
 />
 `;
 
 exports[`Input renders correctly 2`] = `
 <input
-  className="uk-search-field"
+  className="uk-input uk-search-field"
   type="search"
 />
 `;
 
 exports[`Input renders correctly 3`] = `
 <input
-  className="uk-form-danger"
+  className="uk-input  uk-form-danger"
 />
 `;
 
 exports[`Input renders correctly 4`] = `
 <input
-  className="uk-form-success"
+  className="uk-input  uk-form-success"
 />
 `;
 
 exports[`Input renders correctly 5`] = `
 <input
-  className="uk-form-blank"
+  className="uk-input  uk-form-blank"
 />
 `;
 
 exports[`Input renders correctly 6`] = `
 <input
-  className="uk-form-large"
+  className="uk-input  uk-form-large"
 />
 `;
 
 exports[`Input renders correctly 7`] = `
 <input
-  className="uk-form-small"
+  className="uk-input  uk-form-small"
 />
 `;
 
 exports[`Input renders correctly 8`] = `
 <input
-  className="uk-width-1-1"
+  className="uk-input  uk-width-1-1"
 />
 `;
 
 exports[`Input renders correctly 9`] = `
 <input
-  className="uk-form-width-large"
+  className="uk-input  uk-form-width-large"
 />
 `;
 
 exports[`Input renders correctly 10`] = `
 <input
-  className="uk-form-width-medium"
+  className="uk-input  uk-form-width-medium"
 />
 `;
 
 exports[`Input renders correctly 11`] = `
 <input
-  className="uk-form-width-small"
+  className="uk-input  uk-form-width-small"
 />
 `;
 
 exports[`Input renders correctly 12`] = `
 <input
-  className="uk-form-width-mini"
+  className="uk-input  uk-form-width-mini"
 />
 `;
 
@@ -81,7 +81,7 @@ exports[`Input renders correctly 13`] = `
     className="uk-icon-calendar"
   />
   <input
-    className=""
+    className="uk-input "
   />
 </div>
 `;
@@ -94,7 +94,7 @@ exports[`Input renders correctly 14`] = `
     className="uk-icon-calendar"
   />
   <input
-    className=""
+    className="uk-input "
   />
 </div>
 `;
@@ -107,7 +107,7 @@ exports[`Input renders correctly 15`] = `
     className="uk-icon-spinner uk-icon-spin"
   />
   <input
-    className=""
+    className="uk-input "
   />
 </div>
 `;
@@ -120,7 +120,7 @@ exports[`Input renders correctly 16`] = `
     className="uk-icon-refresh uk-icon-spin"
   />
   <input
-    className=""
+    className="uk-input "
   />
 </div>
 `;