diff --git a/addon/components/sticky-element.js b/addon/components/sticky-element.js
index 4a9b0cf..79d3cf9 100644
--- a/addon/components/sticky-element.js
+++ b/addon/components/sticky-element.js
@@ -4,7 +4,9 @@ import { htmlSafe } from '@ember/string';
 import Component from '@ember/component';
 import { computed } from '@ember/object';
 import { later, cancel, debounce } from '@ember/runloop';
-import layout from '../templates/components/sticky-element';
+import { guidFor } from '@ember/object/internals';
+import polyfillLayout from '../templates/components/polyfill-sticky-element';
+import nativeLayout from '../templates/components/sticky-element';
 
 const { testing } = Ember;
 
@@ -20,9 +22,10 @@ function elementPosition(element, offseTop, offsetBottom) {
 }
 
 export default Component.extend({
-  layout,
-  classNames: ['sticky-element-container'],
-  attributeBindings: ['style'],
+  layout: computed('hasNativeSupport', function() {
+    return this.get('hasNativeSupport') ? nativeLayout : polyfillLayout;
+  }),
+  tagName: '',
 
   /**
    * The offset from the top of the viewport when to start sticking to the top
@@ -150,6 +153,13 @@ export default Component.extend({
    */
   ownWidth: 0,
 
+  /**
+   * @property wrapper
+   * @type {Node|null}
+   * @private
+   */
+  wrapper: null,
+
   /**
    * @property stickToBottom
    * @type {boolean}
@@ -177,6 +187,25 @@ export default Component.extend({
    */
   bottomTriggerElement: null,
 
+  /**
+   * Feature detection stolen from modernizr
+   * https://github.com/Modernizr/Modernizr/blob/master/feature-detects/css/positionsticky.js
+   *
+   * @property hasNativeSupport
+   * @private
+   */
+  hasNativeSupport: computed(function() {
+    let prop = 'position:';
+    let value = 'sticky';
+    let el = document.createElement('a');
+    let mStyle = el.style;
+    let prefixes = ["", "-webkit-", "-moz-", "-o-", "-ms-"];
+
+    mStyle.cssText = prop + prefixes.join(value + ';' + prop).slice(0, -prop.length);
+
+    return mStyle.position.indexOf(value) !== -1;
+  }),
+
   /**
    * @property offsetBottom
    * @type {number}
@@ -188,13 +217,46 @@ export default Component.extend({
   }),
 
   /**
-   * Dynamic style for the components element
+   * Dynamic style for the sticky element
+   * if the component is used with native sticky support
+   *
+   * @property nativeStyle
+   * @type {string}
+   * @private
+   */
+  nativeStyle: computed('enabled', 'hasNativeSupport', 'top', 'bottom', 'stickToBottom', function() {
+    if (this.get('enabled') && this.get('hasNativeSupport')) {
+      let style = `position: sticky; top: ${this.get('top')}px;`;
+      if (this.get('stickToBottom')) {
+        style += `bottom: ${this.get('bottom')}px`;
+      }
+      return htmlSafe(style);
+    } else {
+      return '';
+    }
+  }),
+
+  /**
+   * Id for the wrapper element
+   * if the component is used with polyfill mode
+   *
+   * @property wrapperId
+   * @type {string}
+   * @private
+   */
+  wrapperId: computed(function() {
+    return guidFor(this);
+  }),
+
+  /**
+   * Dynamic style for the wrapper element
+   * if the component is used with polyfill mode
    *
-   * @property style
+   * @property wrapperStyle
    * @type {string}
    * @private
    */
-  style: computed('isSticky', 'ownHeight', 'ownWidth', function() {
+  wrapperStyle: computed('isSticky', 'ownHeight', 'ownWidth', function() {
     let height = this.get('ownHeight');
     if (height > 0 && this.get('isSticky')) {
       return htmlSafe(`height: ${height}px;`);
@@ -271,8 +333,8 @@ export default Component.extend({
       return false;
     }
     this.set('windowHeight', window.innerHeight);
-    this.set('ownHeight', this.element.offsetHeight);
-    this.set('ownWidth', this.element.offsetWidth);
+    this.set('ownHeight', this.get('wrapper').offsetHeight);
+    this.set('ownWidth', this.get('wrapper').offsetWidth);
   },
 
   updatePosition() {
@@ -288,6 +350,8 @@ export default Component.extend({
 
   didInsertElement() {
     this._super(...arguments);
+    let wrapperId = this.get('wrapperId');
+    this.set('wrapper', document.getElementById(wrapperId));
     this.updateDimension();
     // scheduleOnce('afterRender', this, this.updateDimension);
     this.initResizeEventListener();
diff --git a/addon/templates/components/polyfill-sticky-element.hbs b/addon/templates/components/polyfill-sticky-element.hbs
new file mode 100644
index 0000000..2e36544
--- /dev/null
+++ b/addon/templates/components/polyfill-sticky-element.hbs
@@ -0,0 +1,24 @@
+<div id={{wrapperId}} class="sticky-element-container {{class}}" style={{wrapperStyle}}>
+  {{sticky-element/trigger offset=top enter=(action "parentTopEntered") exit=(action "parentTopExited") registerElement=(action "registerTopTrigger")}}
+
+  <div class="
+    {{containerClassName}}
+    {{if isSticky containerStickyClassName}}
+    {{if isStickyTop containerStickyTopClassName}}
+    {{if isStickyBottom containerStickyBottomClassName}}"
+    style={{containerStyle}}>
+
+    {{yield
+      (hash
+        isSticky=isSticky
+        isStickyTop=isStickyTop
+        isStickyBottom=isStickyBottom
+      )
+    }}
+
+  </div>
+
+  {{#if stickToBottom}}
+    {{sticky-element/trigger type="bottom" offset=offsetBottom enter=(action "parentBottomEntered") exit=(action "parentBottomExited") registerElement=(action "registerBottomTrigger")}}
+  {{/if}}
+</div>
diff --git a/addon/templates/components/sticky-element.hbs b/addon/templates/components/sticky-element.hbs
index c22878b..6e3aa1a 100644
--- a/addon/templates/components/sticky-element.hbs
+++ b/addon/templates/components/sticky-element.hbs
@@ -1,22 +1,15 @@
 {{sticky-element/trigger offset=top enter=(action "parentTopEntered") exit=(action "parentTopExited") registerElement=(action "registerTopTrigger")}}
 
-<div class="
-  {{containerClassName}}
-  {{if isSticky containerStickyClassName}}
-  {{if isStickyTop containerStickyTopClassName}}
-  {{if isStickyBottom containerStickyBottomClassName}}"
-  style={{containerStyle}}>
-
+<div id={{wrapperId}} class="sticky-element {{class}}" style={{nativeStyle}}>
   {{yield
-    (hash
-      isSticky=isSticky
-      isStickyTop=isStickyTop
-      isStickyBottom=isStickyBottom
-    )
+      (hash
+        isSticky=isSticky
+        isStickyTop=isStickyTop
+        isStickyBottom=isStickyBottom
+      )
   }}
-
 </div>
 
 {{#if stickToBottom}}
   {{sticky-element/trigger type="bottom" offset=offsetBottom enter=(action "parentBottomEntered") exit=(action "parentBottomExited") registerElement=(action "registerBottomTrigger")}}
-{{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/tests/dummy/app/templates/index.hbs b/tests/dummy/app/templates/index.hbs
index 6e410c4..607730a 100644
--- a/tests/dummy/app/templates/index.hbs
+++ b/tests/dummy/app/templates/index.hbs
@@ -1,6 +1,6 @@
 <h1>ember-sticky-element</h1>
 
-<div class="demo row">
+<div class="demo">
   <div class="col small">
     {{#sticky-element class="sticky" as |sticky|}}
 
@@ -43,7 +43,7 @@
 
   <div class="col large bottom">
     {{#sticky-element class="sticky" bottom=0 as |sticky|}}
-      
+
       <p>large, sticky to bottom</p>
       <p class="debug">
         {{sticky-debug sticky}}
@@ -112,4 +112,3 @@
   </div>
 
 </div>
-