diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index ffb999a54..0676e8a46 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -114,26 +114,19 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 <div class="usability_hint <?php if ($hint == "") { echo "hidden"; } ?>"><?php echo $hint; ?></div>
 
 <div class="wrapper <?php if (isset($this->layout()->parent_page)) echo "wrapper_panel";?>" id="content">
-    <?php if (isset($this->layout()->parent_page)) { ?>
-    <div style="display: flex; width: 100%">
-        <div style="flex: 0 140px;"> <!-- placeholder object so we can fixed position the submenu -->
-            <div id="sub-menu">
-                <h3><?php //parent_page is passed in from controller
-                    echo $this->layout()->parent_page; ?></h3>
-                <hr>
-                <?php
-                $page = $this->navigation()->findOneBy('title', $this->layout()->parent_page);
-                echo $this->navigation()->menu()->renderMenu($page);
-                ?>
-            </div>
-        </div>
-        <div id="sub-menu-content-panel">
-            <?php echo $this->layout()->content ?>
-        </div>
-    </div>
-    <?php } else { echo $this->layout()->content; } ?>
-
+    <?php echo $this->layout()->content ?>
 </div>
+<?php if (isset($this->layout()->parent_page)) { ?>
+    <div id="sub-menu">
+        <h3><?php //parent_page is passed in from controller
+            echo $this->layout()->parent_page; ?></h3>
+        <hr>
+        <?php
+        $page = $this->navigation()->findOneBy('title', $this->layout()->parent_page);
+        echo $this->navigation()->menu()->renderMenu($page);
+        ?>
+    </div>
+<?php } ?>
 
 <script id="tmpl-pl-cues" type="text/template">
 <div class="waveform-cues">
diff --git a/airtime_mvc/public/css/_showbuilder.css b/airtime_mvc/public/css/_showbuilder.css
index d60660a94..c1f4c06e7 100644
--- a/airtime_mvc/public/css/_showbuilder.css
+++ b/airtime_mvc/public/css/_showbuilder.css
@@ -610,7 +610,7 @@ th.library_checkbox {
 
 /* This is so dragged items show up above the layout */
 
-.ui-draggable-dragging {
+#library_display .ui-draggable-dragging {
     z-index: 9999;
     position: fixed !important;
 }
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 0d5b45d6d..632949b98 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -3416,16 +3416,17 @@ dd .stream-status {
  * absolute positioning in Airtime) when we want
  * to focus on responsive design.
  */
-.usability_hint:not(.hidden) + .wrapper {
+.usability_hint:not(.hidden) + .wrapper,
+.usability_hint:not(.hidden) ~ #sub-menu {
     top: 130px;
-
-    -webkit-transition: top 0.2s linear;
-    -moz-transition: top 0.2s linear;
-    -o-transition: top 0.2s linear;
-    transition: top 0.2s linear;
-    /*padding-top: 40px;*/
 }
 
+.usability_hint.hidden ~ #sub-menu,
+.usability_hint.hidden + .wrapper{
+    top: 102px;
+}
+
+
 .usability_hint a {
     color: white;
 }
@@ -3621,6 +3622,11 @@ button.btn-icon-text > i.icon-white {
     color: #cecece;
     padding: 10px;
     z-index: 1;
+
+    -webkit-transition: top 0.2s linear;
+    -moz-transition: top 0.2s linear;
+    -o-transition: top 0.2s linear;
+    transition: top 0.2s linear;
 }
 
 #sub-menu h3 {
diff --git a/airtime_mvc/public/js/airtime/common/common.js b/airtime_mvc/public/js/airtime/common/common.js
index 0cf4794fe..a423b5be7 100644
--- a/airtime_mvc/public/js/airtime/common/common.js
+++ b/airtime_mvc/public/js/airtime/common/common.js
@@ -1,7 +1,5 @@
 var previewWidth = 482,
-    previewHeight = 110,
-    USABILITY_HINT_HIDDEN_TOP = 102,
-    USABILITY_HINT_VISIBLE_TOP = 130;
+    previewHeight = 110;
 
 $(document).ready(function() {
 
@@ -14,7 +12,6 @@ $(document).ready(function() {
 
     //this statement tells the browser to fade out any success message after 5 seconds
     setTimeout(function(){$(".success").fadeOut("slow", function(){$(this).empty()});}, 5000);
-    adjustForUsabilityHint();
 });
 
 /*
@@ -194,18 +191,12 @@ function removeSuccessMsg() {
     $status.fadeOut("slow", function(){$status.empty()});
 }
 
-function adjustForUsabilityHint() {
-    var topVal = ($(".usability_hint").is(":visible") ? USABILITY_HINT_VISIBLE_TOP : USABILITY_HINT_HIDDEN_TOP);
-    $("#sub-menu").css("top", topVal);
-}
-
 function hideHint(h) {
     h.hide("slow").addClass("hidden");
 }
 
 function showHint(h) {
     h.show("slow").removeClass("hidden");
-    $(".wrapper, #sub-menu").css("top", USABILITY_HINT_VISIBLE_TOP);
 }
 
 function getUsabilityHint() {
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index b2d69185f..6a3afaf9b 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -849,7 +849,7 @@ var AIRTIME = (function(AIRTIME) {
             AIRTIME.library.dblClickAdd(data, data.ftype);
         });
 
-        $libTable.find("tbody").on("mousedown", "tr > td.library_checkbox", function(ev) {
+        $libTable.find("tbody").on("mousedown", "tr.lib-audio > td.library_checkbox", function(ev) {
             var $tr = $(this).parent(),
             // Get the ID of the selected row
                 $rowId = $tr.attr("id");
@@ -878,7 +878,7 @@ var AIRTIME = (function(AIRTIME) {
             }
         });
 
-        $libTable.find("tbody").on("mousedown", "tr > td:not(.library_checkbox)", function(ev) {
+        $libTable.find("tbody").on("mousedown", "tr.lib-audio > td:not(.library_checkbox)", function(ev) {
             var $tr = $(this).parent(),
             // Get the ID of the selected row
                 $rowId = $tr.attr("id");
@@ -945,7 +945,7 @@ var AIRTIME = (function(AIRTIME) {
 
         // begin context menu initialization.
         AIRTIME.library.ctxMenu = $.contextMenu({
-            selector: '#library_display tr:has(td)',
+            selector: '#library_display tr.lib-audio:has(td)',
             //trigger: "left",
             trigger: "custom",