diff --git a/src/main/java/org/olat/course/nodes/appointments/ui/AppointmentListController.java b/src/main/java/org/olat/course/nodes/appointments/ui/AppointmentListController.java
index 69d7831f2c7f99070e975ebffd08058001a433c1..d6f8be15fdec486c97a7d77ee1b76515eaeb0134 100644
--- a/src/main/java/org/olat/course/nodes/appointments/ui/AppointmentListController.java
+++ b/src/main/java/org/olat/course/nodes/appointments/ui/AppointmentListController.java
@@ -77,8 +77,6 @@ public abstract class AppointmentListController extends FormBasicController impl
 	private static final String CMD_EDIT = "edit";
 	
 	private FormLink backLink;
-	private FormLink deleteTopicLink;
-	private FormLink editTopicLink;
 	private FormLink addAppointmentLink;
 	private FlexiTableElement tableEl;
 	private AppointmentDataModel dataModel;
@@ -126,7 +124,7 @@ public abstract class AppointmentListController extends FormBasicController impl
 	
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		// Buttons
+		// Back
 		FormLayoutContainer backButtons = FormLayoutContainer.createButtonLayout("backButtons", getTranslator());
 		backButtons.setRootForm(mainForm);
 		formLayout.add("backButtons", backButtons);
@@ -135,6 +133,12 @@ public abstract class AppointmentListController extends FormBasicController impl
 		backLink = uifactory.addFormLink("backLink", "back", "back", "", backButtons, Link.LINK_BACK);
 		backLink.setElementCssClass("o_back");
 		
+		// Header
+		headerCtrl = new TopicHeaderController(ureq, getWindowControl(), topic, false);
+		listenTo(headerCtrl);
+		flc.put("header", headerCtrl.getInitialComponent());
+		
+		// Buttons
 		if (canEdit()) {
 			FormLayoutContainer topButtons = FormLayoutContainer.createButtonLayout("topButtons", getTranslator());
 			topButtons.setRootForm(mainForm);
@@ -142,24 +146,12 @@ public abstract class AppointmentListController extends FormBasicController impl
 			topButtons.setElementCssClass("o_button_group o_button_group_right");
 			
 			List<Organizer> organizers = appointmentsService.getOrganizers(topic);
-			if (secCallback.canEditTopic(organizers)) {
-				deleteTopicLink = uifactory.addFormLink("delete.topic", topButtons, Link.BUTTON);
-				deleteTopicLink.setIconLeftCSS("o_icon o_icon-lg o_icon_delete");
-				editTopicLink = uifactory.addFormLink("edit.topic", topButtons, Link.BUTTON);
-				editTopicLink.setIconLeftCSS("o_icon o_icon-lg o_icon_edit");
-			}
 			if (secCallback.canEditAppointment(organizers)) {
 				addAppointmentLink = uifactory.addFormLink("add.appointment", topButtons, Link.BUTTON);
 				addAppointmentLink.setIconLeftCSS("o_icon o_icon-lg o_icon_add");
 			}
 		}
 		
-		// Header
-		headerCtrl = new TopicHeaderController(ureq, getWindowControl(), topic, false);
-		listenTo(headerCtrl);
-		
-		flc.put("header", headerCtrl.getInitialComponent());
-		
 		// Table
 		FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
 		if (ureq.getUserSession().getRoles().isAdministrator()) {
diff --git a/src/main/java/org/olat/course/nodes/appointments/ui/_content/appointments_list.html b/src/main/java/org/olat/course/nodes/appointments/ui/_content/appointments_list.html
index 8b1ccc8a780fac72b6259746125cee421c4e40a4..bd89d98e084bcfec10c93367b886b7651fd113fe 100644
--- a/src/main/java/org/olat/course/nodes/appointments/ui/_content/appointments_list.html
+++ b/src/main/java/org/olat/course/nodes/appointments/ui/_content/appointments_list.html
@@ -1,8 +1,8 @@
 <div class="o_appointments">
 	$r.render("backButtons")
+	$r.render("header")
 	#if($r.available("topButtons"))
 		$r.render("topButtons")
 	#end
-	$r.render("header")
 	$r.render("table")
 </div>
\ No newline at end of file