diff --git a/app/assets/stylesheets/my_modules/results/index.scss b/app/assets/stylesheets/my_modules/results/index.scss
index 32e1a7633..703614586 100644
--- a/app/assets/stylesheets/my_modules/results/index.scss
+++ b/app/assets/stylesheets/my_modules/results/index.scss
@@ -68,10 +68,6 @@
 }
 
 .result {
-  .panel {
-    margin-left: 4.25em !important;
-  }
-
   .ql-editor {
     overflow-x: auto;
   }
diff --git a/app/assets/stylesheets/steps/components/text.scss b/app/assets/stylesheets/steps/components/text.scss
index 2a7edcdbc..43f0d679c 100644
--- a/app/assets/stylesheets/steps/components/text.scss
+++ b/app/assets/stylesheets/steps/components/text.scss
@@ -1,5 +1,4 @@
 .step-text-container {
-  display: flex;
   border-radius: 4px;
   margin-bottom: 16px;
   padding-left: var(--left-component-padding);
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index ee1a08d42..2af25c1d2 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -1004,10 +1004,6 @@ ul.content-activities {
 
 .step,
 .result {
-  .panel {
-    margin-left: 38px;
-  }
-
   .result-panel-collapse-link {
     text-decoration: none;
 
diff --git a/app/controllers/my_module_shareable_links_controller.rb b/app/controllers/my_module_shareable_links_controller.rb
index 391dbff53..2104255a1 100644
--- a/app/controllers/my_module_shareable_links_controller.rb
+++ b/app/controllers/my_module_shareable_links_controller.rb
@@ -56,7 +56,7 @@ class MyModuleShareableLinksController < ApplicationController
                else @results.order(created_at: :desc)
                end
 
-    @gallery = @results.left_joins(:asset).pluck('assets.id').compact
+    @gallery = @results.left_joins(:assets).pluck('assets.id').compact
 
     render 'shareable_links/my_module_results_show', layout: 'shareable_links'
   end
diff --git a/app/views/shareable_links/my_modules/results/_result.html.erb b/app/views/shareable_links/my_modules/results/_result.html.erb
index 57ece5c3d..a0aa82c11 100644
--- a/app/views/shareable_links/my_modules/results/_result.html.erb
+++ b/app/views/shareable_links/my_modules/results/_result.html.erb
@@ -1,13 +1,4 @@
 <div class="result">
-  <div class="result-icon">
-    <% if result.is_text %>
-      <span class="sn-icon sn-icon-result-text"></span>
-    <% elsif result.is_table %>
-      <span class="sn-icon sn-icon-tables"></span>
-    <% elsif result.is_asset %>
-      <span class="sn-icon sn-icon-files"></span>
-    <% end %>
-  </div>
   <div class="panel panel-default">
     <div class="panel-heading">
       <div class="panel-options pull-right">
@@ -22,19 +13,15 @@
       <div class="panel-body">
         <div class="row">
           <div class="col-xs-12">
-            <% if result.is_text %>
-              <div class="ql-editor">
-                 <%= smart_annotation_text(result.result_text.shareable_tinymce_render(:text)) %>
-              </div>
-            <% elsif result.is_table %>
-              <div class="hot-table">
-                <input type="hidden" class="hot-table-contents" value="<%= result.table.contents_utf_8 %>" />
-                <input type="hidden" class="hot-table-metadata" value="<%= result.table.metadata ? result.table.metadata.to_json : nil %>" />
-                <div class="hot-table-container"></div>
-              </div>
-            <% elsif result.is_asset %>
-              <%= render partial: "shareable_links/my_modules/step_attachments/#{ result.asset.view_mode }", locals: { asset: result.asset } %>
-              <%= render partial: "shareable_links/my_modules/step_attachments/file_preview", locals: { asset: result.asset, gallery: gallery } %>
+            <% result.result_orderable_elements.sort_by(&:position).each do |element| %>
+              <% if element.orderable_type == 'ResultText' %>
+                <%= render partial: "shareable_links/my_modules/step_elements/text", locals: { element: element.orderable } %>
+              <% elsif element.orderable_type == 'ResultTable'%>              
+                <%= render partial: "shareable_links/my_modules/step_elements/table", locals: { element: element.orderable.table } %>
+              <% end %>
+            <% end %>
+            <% if result.result_assets.present? %>
+              <%= render partial: "shareable_links/my_modules/attachments", locals: { attachments: result.assets, step: result } %>
             <% end %>
           </div>
         </div>
diff --git a/app/views/shareable_links/my_modules/step_elements/_table.html.erb b/app/views/shareable_links/my_modules/step_elements/_table.html.erb
index c04811a1d..c5eeb6c74 100644
--- a/app/views/shareable_links/my_modules/step_elements/_table.html.erb
+++ b/app/views/shareable_links/my_modules/step_elements/_table.html.erb
@@ -1,6 +1,5 @@
 <div class="step-table-container">
   <div class="step-element-header step-element--locked">
-    <div class="step-element-grip-placeholder"></div>
     <% if element.name.present? %>
       <div class="step-element-name">
         <%= render partial: "shareable_links/my_modules/inline_view", locals: { text: element.name, smart_annotation_enabled: false } %>
diff --git a/app/views/shareable_links/my_modules/step_elements/_text.html.erb b/app/views/shareable_links/my_modules/step_elements/_text.html.erb
index a91a11b9e..ad2ed78a8 100644
--- a/app/views/shareable_links/my_modules/step_elements/_text.html.erb
+++ b/app/views/shareable_links/my_modules/step_elements/_text.html.erb
@@ -1,5 +1,11 @@
 <div class="step-text-container step-element--locked locked" tabindex="0">
-  <div class="step-element-grip-placeholder"></div>
+  <% if element.name.present? %>
+    <div class="step-element-header step-element--locked mt-4">
+        <div class="step-element-name">
+          <%= render partial: "shareable_links/my_modules/inline_view", locals: { text: element.name, smart_annotation_enabled: false } %>
+          </div>
+    </div>
+  <% end %>
   <% if element.text.present? %>
     <div class="view-text-element">
       <%= smart_annotation_text(element.shareable_tinymce_render(:text)) %>