diff --git a/Slinky.sketchplugin/Contents/Sketch/Slinky.js b/Slinky.sketchplugin/Contents/Sketch/Slinky.js
index e7557ce..1563e3a 100644
--- a/Slinky.sketchplugin/Contents/Sketch/Slinky.js
+++ b/Slinky.sketchplugin/Contents/Sketch/Slinky.js
@@ -1281,12 +1281,10 @@ function createTable(layers, size) {
                     depth: size.depth + 4
                 };
                 var cellContent = (layers[cell].children.length === 0) ? getCellContent(layers[cell], size.depth, childTableSize) : createTable(layers[cell].children, childTableSize);
-                result += indent(size.depth + 2, "<td style=\"" + cellStyle + "\" colspan=\"" + colspan + "\" rowspan=\"" + rowspan + "\">");
+                result += indent(size.depth + 2, "<td style=\"" + cellStyle + " " + getCellStyle(layers[cell], childTableSize, { x: cellOffsetX, y: cellOffsetY }) + "\" colspan=\"" + colspan + "\" rowspan=\"" + rowspan + "\">");
                 if (layers[cell].url)
                     result += indent(size.depth + 3, "<a href=\"" + formatLink(layers[cell].url) + "\" style=\"text-decoration:none;\">");
-                result += indent(size.depth + 3, "<div style=\"" + getCellStyle(layers[cell], childTableSize, { x: cellOffsetX, y: cellOffsetY }) + "\">");
                 result += cellContent;
-                result += indent(size.depth + 3, "</div>");
                 if (layers[cell].url)
                     result += indent(size.depth + 3, "</a>");
                 result += indent(size.depth + 2, "</td>");
@@ -1341,7 +1339,7 @@ function getCellContent(layer, depth, size) {
     return "";
 }
 function getCellStyle(layer, size, offset) {
-    var style = "display:block;";
+    var style = "";
     var width = size.width;
     var height = size.height;
     if (offset.x)
@@ -1460,12 +1458,12 @@ function sketchToLayers(layerGroup, offset, command) {
                         border: borderWidth,
                         css: layerCSS,
                         content: (layer.class() == MSTextLayer) ? splitText(layer) : null,
-                        source: (layer.isLayerExportable()) ? "assets/" + unescape(layer.objectID()) + "@2x.png" : null,
+                        source: (layer.isLayerExportable()) ? "assets/" + unescape(layer.name()) + ".png" : null,
                         children: []
                     });
                 }
                 if (layer.isLayerExportable()) {
-                    assets.push(unescape(layer.objectID()));
+                    assets.push(unescape(layer.name()));
                 }
             }
         }
@@ -1554,6 +1552,7 @@ function parseCSSAttributes(attributes) {
     });
     return result;
 }
+//# sourceMappingURL=convert.js.map
 
 var pluginIdentifier = "com.sketchapp.slinky-plugin";
 function setPreferences(key, value) {
@@ -1612,9 +1611,9 @@ function exportAssets(context, itemIds, outputFolder) {
         "-l",
         sketchtool + ' export ' + 'slices'
             + ' "' + sketchFile + '"'
-            + ' --scales=2'
+            + ' --scales=1'
             + ' --formats=png'
-            + ' --use-id-for-name=yes'
+            + ' --use-id-for-name=no'
             + ' --group-contents-only="yes"'
             + ' --save-for-web="no"'
             + ' --overwriting="yes"'
@@ -1644,7 +1643,6 @@ function runCommand(command, args) {
         return false;
     }
 }
-//# sourceMappingURL=index.js.map
 
 var sidebarID = "slinky_url";
 var sidebarParent = "view_coordinates";
diff --git a/source/package-lock.json b/source/package-lock.json
index c22c65b..1563d95 100644
--- a/source/package-lock.json
+++ b/source/package-lock.json
@@ -1086,15 +1086,6 @@
             }
           }
         },
-        "string_decoder": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
-          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
         "string-width": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -1106,6 +1097,15 @@
             "strip-ansi": "3.0.1"
           }
         },
+        "string_decoder": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
+          "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
         "stringstream": {
           "version": "0.0.5",
           "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
diff --git a/source/slinky/AppKit/index.ts b/source/slinky/AppKit/index.ts
index 47189d1..72b17fa 100644
--- a/source/slinky/AppKit/index.ts
+++ b/source/slinky/AppKit/index.ts
@@ -93,7 +93,7 @@ export function exportAssets(context: SketchContext, itemIds: string[], outputFo
       + ' "' + sketchFile + '"'
       + ' --scales=2'
       + ' --formats=png'
-      + ' --use-id-for-name=yes'
+      + ' --use-id-for-name=no'
       + ' --group-contents-only="yes"'
       + ' --save-for-web="no"'
       + ' --overwriting="yes"'
diff --git a/source/slinky/convert.ts b/source/slinky/convert.ts
index 913ad35..45014ec 100644
--- a/source/slinky/convert.ts
+++ b/source/slinky/convert.ts
@@ -221,13 +221,11 @@ function createTable(layers: Layer[], size: TableSize){
             // Prepare cell's content
             const cellContent = (layers[cell].children.length === 0) ? getCellContent(layers[cell], size.depth, childTableSize) : createTable(layers[cell].children, childTableSize)
 
-            result +=  indent(size.depth + 2, `<td style="${cellStyle}" colspan="${colspan}" rowspan="${rowspan}">`)
+            result +=  indent(size.depth + 2, `<td style="${cellStyle} ${getCellStyle(layers[cell], childTableSize, {x: cellOffsetX, y: cellOffsetY})}" colspan="${colspan}" rowspan="${rowspan}">`)
 
             if(layers[cell].url) result += indent(size.depth + 3, `<a href="${formatLink(layers[cell].url)}" style="text-decoration:none;">`)
 
-            result +=  indent(size.depth + 3, `<div style="${getCellStyle(layers[cell], childTableSize, {x: cellOffsetX, y: cellOffsetY})}">`)
             result +=  cellContent
-            result +=  indent(size.depth + 3, `</div>`)
 
             if(layers[cell].url) result += indent(size.depth + 3, `</a>`)
 
@@ -312,7 +310,7 @@ function getCellContent(layer: Layer, depth: number, size: TableSize){
 
 function getCellStyle(layer: Layer, size: TableSize, offset: {x: number, y: number}){
 
-   let style = "display:block;"
+   let style = ""
 
    let width = size.width
    let height = size.height
@@ -483,14 +481,14 @@ function sketchToLayers(layerGroup: MSLayer[], offset?: {x: number, y: number},
                   border: borderWidth,
                   css: layerCSS,
                   content: (layer.class() == MSTextLayer) ? splitText(layer) : null,
-                  source: (layer.isLayerExportable()) ? `assets/${unescape(layer.objectID())}@2x.png` : null,
+                  source: (layer.isLayerExportable()) ? `assets/${unescape(layer.name())}.png` : null,
                   children: []
                })
 
             }
 
             if(layer.isLayerExportable()){
-               assets.push(unescape(layer.objectID()))
+               assets.push(unescape(layer.name()))
             }
 
          }