diff --git a/app/components/draggable-dropzone.js b/app/components/draggable-dropzone.js
index c8d7956..18cdbff 100644
--- a/app/components/draggable-dropzone.js
+++ b/app/components/draggable-dropzone.js
@@ -30,9 +30,9 @@ export default Ember.Component.extend({
   drop(event) {
     var data = event.dataTransfer.getData('text/data');
     var position = {
-      x: event.originalEvent.pageX - $(event.target).offset().left - parseFloat(event.dataTransfer.getData('offset/x')),
-      y: event.originalEvent.pageY - $(event.target).offset().top - parseFloat(event.dataTransfer.getData('offset/y'))
-    }
+      x: event.originalEvent.pageX - Ember.$(event.target).offset().left - parseFloat(event.dataTransfer.getData('offset/x')),
+      y: event.originalEvent.pageY - Ember.$(event.target).offset().top - parseFloat(event.dataTransfer.getData('offset/y'))
+    };
 
     this.sendAction('dropped', data, position);
 
diff --git a/app/components/draggable-item.js b/app/components/draggable-item.js
index 71d5dee..c390d26 100644
--- a/app/components/draggable-item.js
+++ b/app/components/draggable-item.js
@@ -17,8 +17,8 @@ export default Ember.Component.extend({
   draggable: 'true',
 
   dragStart(event) {
-    event.dataTransfer.setData('offset/x', event.originalEvent.pageX - $(event.target).offset().left);
-    event.dataTransfer.setData('offset/y', event.originalEvent.pageY - $(event.target).offset().top);
+    event.dataTransfer.setData('offset/x', event.originalEvent.pageX - Ember.$(event.target).offset().left);
+    event.dataTransfer.setData('offset/y', event.originalEvent.pageY - Ember.$(event.target).offset().top);
 
     return event.dataTransfer.setData('text/data', get(this, 'content'));
   }
diff --git a/app/components/file-upload.js b/app/components/file-upload.js
index 461df9b..12c0dd0 100644
--- a/app/components/file-upload.js
+++ b/app/components/file-upload.js
@@ -7,7 +7,6 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  **********************************************************************************/
 
-import Ember from 'ember';
 import EmberUploader from 'ember-uploader';
 
 export default EmberUploader.FileField.extend({
diff --git a/app/components/widget-image.js b/app/components/widget-image.js
index e7c062a..b4f15f0 100644
--- a/app/components/widget-image.js
+++ b/app/components/widget-image.js
@@ -13,8 +13,7 @@ import ENV from '../config/environment';
 import EmberUploader from 'ember-uploader';
 
 const {
-  inject: { service },
-  RSVP
+  inject: { service }
 } = Ember;
 
 export default WidgetAbstract.extend({
@@ -95,7 +94,7 @@ export default WidgetAbstract.extend({
 
         var self = this;
 
-        uploader.upload(files).then(event => {
+        uploader.upload(files).then(function() {
           // reload user
           var user = self.get('sessionUser.user');
           self.get('store').findRecord('user', user.get('id'));
diff --git a/app/components/widget-plot.js b/app/components/widget-plot.js
index 4cc045e..707f9fd 100644
--- a/app/components/widget-plot.js
+++ b/app/components/widget-plot.js
@@ -84,7 +84,7 @@ export default WidgetAbstract.extend({
 
     // update observer TODO: Only update when (query) changed
     let observeQuery = this.get('observeQuery');
-    if (query != observeQuery) {
+    if (query !== observeQuery) {
       if (observeQuery != null) {
         this.removeObserver(observeQuery, this._updateData);
       }
diff --git a/app/components/widget-table.js b/app/components/widget-table.js
index 6e9f401..8272310 100644
--- a/app/components/widget-table.js
+++ b/app/components/widget-table.js
@@ -69,7 +69,7 @@ export default WidgetAbstract.extend({
     }
 
     // get values from array
-    let values = this.get('data.' + simulatorId + '.values');
+    let values = this.get('data.' + this.get('widget.widgetData.simulator') + '.values');
     for (let i = 0; i < values.length; i++) {
       if (!signals[i]) {
         break;