diff --git a/LesionTracker/client/components/viewer.css b/LesionTracker/client/components/viewer.css
deleted file mode 100644
index 993a91454..000000000
--- a/LesionTracker/client/components/viewer.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.viewer {
-    width: 100%;
-    height: 100%;
-    margin: 0;
-    padding: 0;
-    background-color: black;
-}
-
-#viewportAndLesionTable {
-    height: 100%;
-    width: calc(100% - 120px);
-    float: right;
-}
\ No newline at end of file
diff --git a/LesionTracker/client/components/viewer.styl b/LesionTracker/client/components/viewer.styl
new file mode 100644
index 000000000..106bd5a6d
--- /dev/null
+++ b/LesionTracker/client/components/viewer.styl
@@ -0,0 +1,18 @@
+.viewer
+  width: 100%
+  height: 100%
+  margin: 0
+  padding: 0
+  background-color: black
+
+#viewportAndLesionTable
+  height: 100%
+  width: calc(100% - 120px)
+  float: right
+
+#imageViewerViewports
+  .viewportContainer
+    // Override the orange highlight in viewerbase
+    // for active viewports
+    &.active, &:hover.active
+      border: 2px solid #777
\ No newline at end of file
diff --git a/Packages/viewerbase/components/basic/loadingText/loadingText.html b/Packages/viewerbase/components/basic/loadingText/loadingText.html
new file mode 100644
index 000000000..73237dfdd
--- /dev/null
+++ b/Packages/viewerbase/components/basic/loadingText/loadingText.html
@@ -0,0 +1,5 @@
+<template name="loadingText">
+    <div class="loadingTextDiv">
+        <h5>Loading... <i class="fa fa-spinner fa-pulse"></i></h5>
+    </div>
+</template>
\ No newline at end of file
diff --git a/Packages/viewerbase/components/basic/loadingText/loadingText.styl b/Packages/viewerbase/components/basic/loadingText/loadingText.styl
new file mode 100644
index 000000000..8a3ac7468
--- /dev/null
+++ b/Packages/viewerbase/components/basic/loadingText/loadingText.styl
@@ -0,0 +1,4 @@
+.loadingTextDiv
+  margin: 30px
+  h5
+    text-align: center
\ No newline at end of file
diff --git a/Packages/viewerbase/components/viewer/imageViewerViewports/imageViewerViewports.styl b/Packages/viewerbase/components/viewer/imageViewerViewports/imageViewerViewports.styl
index 67934dcfb..65693b725 100644
--- a/Packages/viewerbase/components/viewer/imageViewerViewports/imageViewerViewports.styl
+++ b/Packages/viewerbase/components/viewer/imageViewerViewports/imageViewerViewports.styl
@@ -6,8 +6,8 @@
     float: left
     border: 2px solid #777
     
-    &.active
-      border: 2px solid #777
+    &.active, &:hover.active
+      border: 2px solid #9A6617
       
     &:hover
       border: 2px solid white
diff --git a/Packages/viewerbase/package.js b/Packages/viewerbase/package.js
index b36310f0c..68deb0848 100644
--- a/Packages/viewerbase/package.js
+++ b/Packages/viewerbase/package.js
@@ -28,6 +28,9 @@ Package.onUse(function (api) {
     api.addFiles('components/basic/login/login.html', 'client');
     api.addFiles('components/basic/notFound/notFound.html', 'client');
 
+    api.addFiles('components/basic/loadingText/loadingText.html', 'client');
+    api.addFiles('components/basic/loadingText/loadingText.styl', 'client');
+
     api.addFiles('components/basic/hidingPanel/hidingPanel.html', 'client');
     api.addFiles('components/basic/hidingPanel/hidingPanel.js', 'client');
     api.addFiles('components/basic/hidingPanel/hidingPanel.styl', 'client');
diff --git a/Packages/worklist/components/worklistResult/worklistResult.html b/Packages/worklist/components/worklistResult/worklistResult.html
index 2233871c4..bf45255b1 100644
--- a/Packages/worklist/components/worklistResult/worklistResult.html
+++ b/Packages/worklist/components/worklistResult/worklistResult.html
@@ -1,4 +1,5 @@
 <template name="worklistResult">
+    {{ #if studies.count }}
     <table id="tblStudyList" class="table table-striped">
         <thead>
         <tr>
@@ -13,8 +14,11 @@
         </thead>
         <tbody id="studyListData">
         {{#each studies}}
-            {{> worklistStudy }}
+            {{ >worklistStudy }}
         {{/each}}
         </tbody>
     </table>
+    {{ else }}
+        {{ >loadingText }}
+    {{ /if }}
 </template>
\ No newline at end of file