diff --git a/src/Umbraco.Cms.13.x/Views/Partials/blockgrid/Components/heroBlock.cshtml b/src/Umbraco.Cms.13.x/Views/Partials/blockgrid/Components/heroBlock.cshtml
index 797d025..d39b791 100644
--- a/src/Umbraco.Cms.13.x/Views/Partials/blockgrid/Components/heroBlock.cshtml
+++ b/src/Umbraco.Cms.13.x/Views/Partials/blockgrid/Components/heroBlock.cshtml
@@ -5,6 +5,9 @@
     var hasBrightContrast = Model.Content.Value<string>("contrast") == "ffffff";
 }
 
+<pre>Content Picker: @Model.Content.ContentPicker?.Name (@Model.Content.ContentPicker?.Url())</pre>
+<pre>Dropdown: @Model.Content.Dropdown</pre>
+
 <div 
     class="hero"
     style="background-color:#@backgroundColor"
diff --git a/src/Umbraco.Community.BlockPreview/BlockPreviewManifestFilter.cs b/src/Umbraco.Community.BlockPreview/BlockPreviewManifestFilter.cs
index 5806ee8..3079e07 100644
--- a/src/Umbraco.Community.BlockPreview/BlockPreviewManifestFilter.cs
+++ b/src/Umbraco.Community.BlockPreview/BlockPreviewManifestFilter.cs
@@ -16,9 +16,12 @@ public void Filter(List<PackageManifest> manifests)
                 Scripts = new string[]
                 {
                     $"/{Constants.Configuration.AppPluginsRoot}/js/controllers/block-preview.controller.js",
-                    $"/{Constants.Configuration.AppPluginsRoot}/js/directives/published-check.directive.js",
                     $"/{Constants.Configuration.AppPluginsRoot}/js/directives/bind-compile.directive.js",
                     $"/{Constants.Configuration.AppPluginsRoot}/js/resources/preview.resource.js"
+                },
+                Stylesheets = new string[]
+                {
+                    $"/{Constants.Configuration.AppPluginsRoot}/css/block-preview.css"
                 }
             });
         }
diff --git a/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/css/block-preview.css b/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/css/block-preview.css
index f1fb708..fe2d8ba 100644
--- a/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/css/block-preview.css
+++ b/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/css/block-preview.css
@@ -6,6 +6,9 @@
     padding: 8px 35px 8px 14px;
     position: relative;
 }
+    .preview-alert uui-loader {
+        margin-right: 16px;
+    }
 
     .preview-alert, .preview-alert a, .preview-alert h4 {
         color: #fff;
diff --git a/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/js/controllers/block-preview.controller.js b/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/js/controllers/block-preview.controller.js
index 2f3dee8..a8408a9 100644
--- a/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/js/controllers/block-preview.controller.js
+++ b/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/js/controllers/block-preview.controller.js
@@ -78,7 +78,7 @@
             }
 
             function loadPreview() {
-                $scope.markup = $sce.trustAsHtml('<div class="preview-alert preview-alert-info">Loading preview</div>');
+                $scope.markup = $sce.trustAsHtml('<div class="preview-alert preview-alert-info"><uui-loader style="color: #fff"></uui-loader>Loading preview...</div>');
                 $scope.loading = true;
 
                 if ($scope.isGrid) {
diff --git a/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/js/directives/published-check.directive.js b/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/js/directives/published-check.directive.js
deleted file mode 100644
index 97be5ac..0000000
--- a/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/js/directives/published-check.directive.js
+++ /dev/null
@@ -1,50 +0,0 @@
-angular.module('umbraco.filters')
-  .directive('publicationCheck', [function () {
-
-    function setStyle(scope, element) {
-      if (!scope.settings) {
-        element[0].style.opacity = 1;
-        return;
-      }
-      if (scope.settings.hideBlock === '1') {
-        element[0].style.opacity = 0.25;
-        return;
-      }
-
-      if (scope.settings.startDate === '' && scope.settings.endDate === '') {
-        element[0].style.opacity = 1;
-        return;
-      }
-
-      if (Date.parse(scope.settings.startDate) > new Date()) {
-        element[0].style.opacity = 0.25;
-        return;
-      }
-
-      if (Date.parse(scope.settings.endDate) < new Date()) {
-        element[0].style.opacity = 0.25;
-        return;
-      }
-
-      element[0].style.opacity = 1;
-    }
-
-    function link(scope, element, attrs) {
-
-      setStyle(scope, element);
-
-      scope.$watch('settings', function (newValue, oldValue) {
-        if (newValue)
-          setStyle(scope, element);
-      }, true);
-
-    }
-
-    return {
-      restrict: 'A',
-      scope: {
-        'settings': '=',
-      },
-      link: link,
-    };
-  }]);
\ No newline at end of file
diff --git a/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/views/block-preview.html b/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/views/block-preview.html
index 04ec431..325c93a 100644
--- a/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/views/block-preview.html
+++ b/src/Umbraco.Community.BlockPreview/wwwroot/App_Plugins/Umbraco.Community.BlockPreview/views/block-preview.html
@@ -4,11 +4,12 @@
         @import '/App_Plugins/Umbraco.Community.BlockPreview/css/block-preview.css?umb__rnd={{cacheBuster}}';
     </style>
 
-    <div ng-if="loading === false"
-         ng-bind-compile="markup"
-         publication-check
+    <div ng-bind-compile="markup"
          settings="block.settingsData">
-        <div class="preview-alert preview-alert-info">Loading preview...</div>
+        <div class="preview-alert preview-alert-info">
+            <uui-loader style="color: #fff"></uui-loader>
+            Loading preview...
+        </div>
     </div>
 
 </div>