diff --git a/application/views/scripts/schedule/scheduled-content.phtml b/application/views/scripts/schedule/scheduled-content.phtml
index 2b06e0d7b..f9b501922 100644
--- a/application/views/scripts/schedule/scheduled-content.phtml
+++ b/application/views/scripts/schedule/scheduled-content.phtml
@@ -1,24 +1,26 @@
 <?php if(count($this->showContent) > 0) : ?>
 	<?php foreach($this->showContent as $pl) : ?>
-	<li id="g_<?php echo $pl["pl_group"] ?>">
-		<div><span class="ui-icon ui-icon-triangle-1-e"></span></div>
-		<div><?php echo $pl["pl_name"] ?></div>
-		<div><?php echo $pl["pl_creator"] ?></div>
-		<div><?php echo $pl["pl_length"] ?></div>
-		<div><span class="ui-icon ui-icon-close"></span></div>
-		<div class="group_list" style="display:none">
+	<li id="g_<?php echo $pl["pl_group"] ?>" >
+		<h3 class="ui-accordion-header ui-state-default ui-corner-all">
+			<div><span class="ui-icon ui-icon-triangle-1-e"></span></div>
+			<div class="sh_pl_name"><?php echo $pl["pl_name"] ?></div>
+			<div class="sh_pl_creator"><?php echo $pl["pl_creator"] ?></div>
+			<div class="sh_pl_time"><?php echo $pl["pl_length"] ?></div>
+			<div><span class="ui-icon ui-icon-close"></span></div>
+		</h3>
+		<div class="group_list ui-widget-content ui-corner-bottom" style="display:none">
 			<div class="sched_description"><?php echo $pl["pl_description"] ?></div>
 			<?php foreach($pl["pl_content"] as $file) : ?>
 			<div>
-				<span><?php echo $file["f_name"] ?></span>
+				<span class="sh_file_name"><?php echo $file["f_name"] ?></span>
 				<span><?php echo $file["f_length"] ?></span>
 			</div>
-			<div><?php echo $file["f_artist"] ?></div>
+			<div class="sh_file_artist"><?php echo $file["f_artist"] ?></div>
 			<?php endforeach; ?>
 		</div>
 	</li>
 	<?php endforeach; ?>
 <?php else : ?>
-<li>No Playlists</li>
+<li>Nothing Scheduled</li>
 <?php endif; ?>
 
diff --git a/public/css/schedule.css b/public/css/schedule.css
index 2dce26cc5..7750379ca 100644
--- a/public/css/schedule.css
+++ b/public/css/schedule.css
@@ -8,7 +8,7 @@ div.ui-datepicker {
 
 #schedule_playlist_dialog > div {
 	float: left;
-	width: 500px;
+	width: 510px;
 	padding: 5px;
 }
 
@@ -16,22 +16,77 @@ div.ui-datepicker {
 	list-style-type: none;
 	overflow: auto;
 	margin: 0;
-	padding: 0;
-	height: 300px;
+	padding: 10px 5px;
+	height: 275px;
 }
 
-#schedule_playlist_chosen li > div {
+#schedule_playlist_chosen li {
+	float: left;
+	clear: left;
+	margin: 0;
+	width: 95%;
+}
+
+#schedule_playlist_chosen li > h3 {
+	float: left;
+	padding: 0;
+	margin: 0;
+	width: 475px;
+}
+
+#schedule_playlist_chosen li > h3 > div {
 	float: left;
 	margin: 0 5px 2px 0;
 }
 
-#schedule_playlist_chosen li {
+#schedule_playlist_chosen li > h3 > div > span.ui-icon {
+	margin-top: 4px;
+}
+
+#schedule_playlist_chosen li div{
+	float: left;
+}
+
+#schedule_playlist_chosen li > div{
+	width: 475px;
+}
+
+#schedule_playlist_chosen li > div > div > span{
+	float: left;
+}
+
+#schedule_playlist_chosen li > div > div{
 	clear: left;
+	padding-top: 5px;
+	padding-left: 5px;
 }
 
 .sched_description {
 	clear: left;
 	font-size: 85%;
+	margin-left: 2em;
+}
+
+.sh_pl_name {
+	width: 150px;
+}
+
+.sh_pl_creator {
+	width: 125px;
+}
+
+.sh_pl_time {
+	width: 125px;
+}
+
+.sh_file_name {
+	display: inline-block;
+	width: 325px;
+}
+
+.sh_file_artist {
+	font-size: 90%;
+	padding-bottom: 5px;
 }
 
 #show_time_info > div, #show_time_info > span{
@@ -41,6 +96,7 @@ div.ui-datepicker {
 #show_progressbar {
 	width: 150px;
 	height: 5px;
+	margin-top: 12px;
 }
 
 .time {
diff --git a/public/js/airtime/schedule/schedule.js b/public/js/airtime/schedule/schedule.js
index 5931bb6f7..7505447d4 100644
--- a/public/js/airtime/schedule/schedule.js
+++ b/public/js/airtime/schedule/schedule.js
@@ -189,21 +189,25 @@ function setScheduleDialogEvents() {
 				.removeClass("ui-icon-triangle-1-s")
 				.addClass("ui-icon ui-icon-triangle-1-e");
 
-			$(this).parent().find(".group_list").hide();
+			$(this).parent().removeClass("ui-state-active ui-corner-top");
+			$(this).parent().addClass("ui-corner-all");
+			$(this).parent().parent().find(".group_list").hide();
 		}
 		else if(span.hasClass("ui-icon-triangle-1-e")) {
 			span
 				.removeClass("ui-icon-triangle-1-e")
 				.addClass("ui-icon ui-icon-triangle-1-s");
 
-			$(this).parent().find(".group_list").show();
+			$(this).parent().addClass("ui-state-active ui-corner-top");
+			$(this).parent().removeClass("ui-corner-all");
+			$(this).parent().parent().find(".group_list").show();
 		}
 	});
 
 	$(".ui-icon-close").parent().click(function(){
 		var groupId, url;
 		
-		groupId = $(this).parent().attr("id").split("_").pop();
+		groupId = $(this).parent().parent().attr("id").split("_").pop();
 		url = '/Schedule/remove-group/format/json';
 	
 		$.post(url, 
@@ -271,14 +275,18 @@ function makeScheduleDialog(dialog, json) {
 				.removeClass("ui-icon-triangle-1-s")
 				.addClass("ui-icon ui-icon-triangle-1-e");
 
-			$(this).parent().find(".group_list").hide();
+			$(this).parent().removeClass("ui-state-active ui-corner-top");
+			$(this).parent().addClass("ui-corner-all");
+			$(this).parent().parent().find(".group_list").hide();
 		}
 		else if(span.hasClass("ui-icon-triangle-1-e")) {
 			span
 				.removeClass("ui-icon-triangle-1-e")
 				.addClass("ui-icon ui-icon-triangle-1-s");
 
-			$(this).parent().find(".group_list").show();
+			$(this).parent().addClass("ui-state-active ui-corner-top");
+			$(this).parent().removeClass("ui-corner-all");
+			$(this).parent().parent().find(".group_list").show();
 		}
 	});
 
@@ -286,7 +294,7 @@ function makeScheduleDialog(dialog, json) {
 		var groupId, url, search;
 		
 		search = $("#schedule_playlist_search").val();
-		groupId = $(this).parent().attr("id").split("_").pop();
+		groupId = $(this).parent().parent().attr("id").split("_").pop();
 		url = '/Schedule/remove-group/format/json';
 	
 		$.post(url,