Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivities.java
===================================================================
--- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivities.java	(revision f02d7991fb58368b43fb4d22c60858cf1d916f72)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivities.java	(revision 146855e6d1b7b73a1b9fb0fbce4b136cd2b9b06c)
@@ -29,4 +29,7 @@
 	@Property
 	private Activity newActivity;
+
+	@Property
+	private Activity activity;
 
 	@Inject
@@ -68,3 +71,7 @@
 	}
 
+	@CommitAfter
+	void onDeleteActivity(Activity a) {
+		genericService.delete(a);
+	}
 }
Index: eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java
===================================================================
--- eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java	(revision f02d7991fb58368b43fb4d22c60858cf1d916f72)
+++ eprms-tap/src/main/java/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.java	(revision 146855e6d1b7b73a1b9fb0fbce4b136cd2b9b06c)
@@ -113,3 +113,8 @@
 	}
 
+	@CommitAfter
+	void onDeleteActivityType(ActivityType at) {
+		genericService.delete(at);
+	}
+
 }
Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageActivities.tml
===================================================================
--- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageActivities.tml	(revision f02d7991fb58368b43fb4d22c60858cf1d916f72)
+++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageActivities.tml	(revision 146855e6d1b7b73a1b9fb0fbce4b136cd2b9b06c)
@@ -24,5 +24,11 @@
 
 <div t:type="zone" id="zoneActivities" t:id="zoneActivities">
-	<table class="table table-sm" t:type="grid" t:source="allActivities">
+	<table class="table table-sm" t:type="grid" t:source="allActivities"
+		t:row="activity" t:add="actions">
+		<p:actionsCell>
+			<a class="btn btn-danger" t:type="eventlink" t:mixins="confirm"
+				t:id="deleteActivity" t:context="activity"><img t:type="SVGIcon"
+				t:path="minus" /> ${message:delete-label}</a>
+		</p:actionsCell>
 	</table>
 </div>
Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.tml
===================================================================
--- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.tml	(revision f02d7991fb58368b43fb4d22c60858cf1d916f72)
+++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageActivityTypes.tml	(revision 146855e6d1b7b73a1b9fb0fbce4b136cd2b9b06c)
@@ -45,5 +45,8 @@
 			t:id="EditActivityType" id="EditActivityType"
 			t:context="activityType" t:zone="editFormZone"><img
-			t:type="SVGIcon" t:path="edit" /></a>
+			t:type="SVGIcon" t:path="edit" /></a> <a class="btn btn-danger"
+			t:type="eventlink" t:id="deleteActivityType" t:mixins="confirm"
+			t:context="activityType"><img t:type="SVGIcon" t:path="minus" />
+			${message:delete-label}</a>
 	</p>
 </div>
Index: eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageCourses.tml
===================================================================
--- eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageCourses.tml	(revision f02d7991fb58368b43fb4d22c60858cf1d916f72)
+++ eprms-tap/src/main/resources/info/ajanovski/eprms/tap/pages/admin/ManageCourses.tml	(revision 146855e6d1b7b73a1b9fb0fbce4b136cd2b9b06c)
@@ -16,4 +16,20 @@
 				<t:submit t:id="submitSelectParentActivityType" t:value="OK" />
 				<t:submit t:id="cancelSelectParentActivityType" t:value="Cancel" />
+			</form>
+		</div>
+	</t:modalbox>
+</div>
+
+<div t:type="if" t:test="addTeacherForCourse" class="card">
+	<t:modalbox>
+		<div class="card-body">
+			<form t:type="form" t:id="frmAddTeacher" class="form">
+				<div class="form-group">
+					<label t:type="label" t:for="selectTeacher" /> <select
+						t:type="select" t:model="teacherModel" t:id="selectTeacher"
+						t:value="selectTeacher" />
+				</div>
+				<t:submit t:id="submitSelectTeacher" t:value="OK" />
+				<t:eventlink t:id="cancelSelectTeacher">${message:cancel-label}</t:eventlink>
 			</form>
 		</div>
@@ -44,5 +60,5 @@
 <table class="table table-sm table-bordered" t:type="grid"
 	t:source="allCourses" t:row="course" t:exclude="courseId"
-	t:add="activities,actions">
+	t:add="activities,teachers,actions">
 	<p:activitiesCell>
 		<div style="margin-left:${hierarchicalDepth}em !important;"
@@ -58,4 +74,14 @@
 			t:path="plus" class="btn btn-sm btn-primary mt-0">${message:add-label}</t:iconActionLink>
 	</p:activitiesCell>
+	<p:teachersCell>
+		<div t:type="loop" t:source="CourseTeachers" t:value="courseTeacher">
+			${courseTeacher.teacher.userName} <a href="" t:type="actionlink"
+				t:id="deleteCourseTeacher" t:context="courseTeacher"
+				t:mixins="confirm" class="btn btn-sm btn-danger p-0"><svg
+					t:type="svgicon" t:path="minus" /></a>
+		</div>
+		<t:iconActionLink t:id="addCourseTeacher" t:context="course"
+			t:path="plus" class="btn btn-sm btn-primary mt-0">${message:add-label}</t:iconActionLink>
+	</p:teachersCell>
 	<p:actionsCell>
 		<a href="" t:type="actionLink" t:id="editCourse" t:context="course"