diff --git a/airtime_mvc/application/views/scripts/form/showbuilder.phtml b/airtime_mvc/application/views/scripts/form/showbuilder.phtml
index 68173ba41..ddca06770 100644
--- a/airtime_mvc/application/views/scripts/form/showbuilder.phtml
+++ b/airtime_mvc/application/views/scripts/form/showbuilder.phtml
@@ -1,14 +1,9 @@
-<div class="sb-timerange">
-    <div id="sb_edit" class="ui-button ui-state-default" title="open the library to schedule files.">
-        <span class="ui-icon ui-icon-arrowthick-1-nw"></span>
-    </div>
-    <?php echo $this->element->getElement('sb_date_start') ?>
-    <?php echo $this->element->getElement('sb_time_start') ?>
-    <?php echo $this->element->getElement('sb_date_end') ?>
-    <?php echo $this->element->getElement('sb_time_end') ?>
-    <div id="sb_submit" class="ui-button ui-state-default" title="Find Shows">
-        <span class="ui-icon ui-icon-search"></span>
-    </div>
+<?php echo $this->element->getElement('sb_date_start'); ?>
+<?php echo $this->element->getElement('sb_time_start'); ?>
+<?php echo $this->element->getElement('sb_date_end'); ?>
+<?php echo $this->element->getElement('sb_time_end'); ?>
+<div id="sb_submit" class="ui-button ui-state-default" title="Find Shows">
+    <span class="ui-icon ui-icon-search"></span>
 </div>
 <div class="sb-advanced-options">
     <fieldset class="padded display_field push-down-8 closed">
diff --git a/airtime_mvc/application/views/scripts/showbuilder/index.phtml b/airtime_mvc/application/views/scripts/showbuilder/index.phtml
index 84d3db653..6e708004c 100644
--- a/airtime_mvc/application/views/scripts/showbuilder/index.phtml
+++ b/airtime_mvc/application/views/scripts/showbuilder/index.phtml
@@ -9,7 +9,14 @@
 <?php endif; ?>
 
 <div id="show_builder" class="sb-content ui-widget ui-widget-content block-shadow omega-block padded">
+    <div class="sb-timerange">
+        <?php if(!$this->disableLib && !$this->showLib):?>
+        <div id="sb_edit" class="ui-button ui-state-default" title="open the library to schedule files.">
+            <span class="ui-icon ui-icon-arrowthick-1-nw"></span>
+        </div> 
+        <?php endif; ?>
     <?php echo $this->sb_form; ?>
+    </div>
     <table id="show_builder_table" cellpadding="0" cellspacing="0" class="datatable"></table>
 </div>
 
diff --git a/airtime_mvc/public/css/showbuilder.css b/airtime_mvc/public/css/showbuilder.css
index 6aaeeba7e..2598f759e 100644
--- a/airtime_mvc/public/css/showbuilder.css
+++ b/airtime_mvc/public/css/showbuilder.css
@@ -96,12 +96,14 @@ div.sb-timerange div#sb_edit {
 }
 
 div.sb-timerange div#sb_submit {
-	position: absolute;
-	bottom: 0px;
 	padding: 3px;
 	margin-left: 5px;
 }
 
+div.sb-timerange input {
+    vertical-align: top;
+}
+
 div.sb-timerange input#sb_date_start {
     margin-left: 30px;
 }