diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss
index f37d8ed..2f08e2d 100644
--- a/app/assets/stylesheets/_application.scss
+++ b/app/assets/stylesheets/_application.scss
@@ -2060,6 +2060,32 @@ html[data-lingua-franca-example="html"] {
 	}
 }
 
+.conferences-schedule {
+	.actions {
+		margin: 2em;
+	}
+	
+	ul.events, ul.locations {
+		list-style: none;
+
+		.button {
+			float: left;
+			font-size: 1em;
+			margin-bottom: 0.5em;
+			margin-right: 0.5em;
+		}
+
+		h3 {
+			display: inline-block;
+			margin: 0.25em 0 0;
+		}
+
+		li {
+			clear: both;
+		}
+	}
+}
+
 .programme {
 
 	.schedule {
diff --git a/app/views/schedule/show.html.haml b/app/views/schedule/show.html.haml
index a3c0839..27b60b2 100644
--- a/app/views/schedule/show.html.haml
+++ b/app/views/schedule/show.html.haml
@@ -3,26 +3,27 @@
 	- if @this_conference.host?(current_user)
 		= row do
 			= columns(medium: 12) do
-				.actions.left
-					= link_to (_'actions.schedule.edit','Edit Schedule'), edit_schedule_path(@this_conference.slug), class: [:button]
+				- if @locations.present? && @events.present?
+					.actions.left
+						= link_to (_'actions.schedule.edit','Edit Schedule'), edit_schedule_path(@this_conference.slug), class: [:button]
 		= row do
 			= columns(medium: 6) do
 				%h2=_'articles.schedule.headings.Events'
 				- if @events
-					%ul
+					%ul.events
 						- @events.each do |event|
 							%li
 								%h3=_!event.title
 								= link_to (_'actions.events.edit','Edit'), edit_event_path(@this_conference.slug, event.id), class: [:button, :modify]
 				.actions.left
-					= link_to (_'actions.events.create','Add Event'), add_event_path(@this_conference.slug), class: [:button, :modify]
+					= link_to (_'actions.events.create','Add Event'), add_event_path(@this_conference.slug), class: [:button]
 			= columns(medium: 6) do
 				%h2=_'articles.schedule.headings.Locations'
 				- if @locations
-					%ul
+					%ul.locations
 						- @locations.each do |location|
 							%li
 								%h3=_!location.title
 								= link_to (_'actions.locations.edit','Edit'), edit_location_path(@this_conference.slug, location.id), class: [:button, :modify]
 				.actions.left
-					= link_to (_'actions.schedule.edit','Add Location'), add_location_path(@this_conference.slug), class: [:button, :modify]
+					= link_to (_'actions.schedule.edit','Add Location'), add_location_path(@this_conference.slug), class: [:button]