diff --git a/build.gradle b/build.gradle
index 0cd986f..a015071 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 plugins {
   id 'java'
-	id 'org.springframework.boot' version '3.5.0'
-	id "io.spring.dependency-management" version "1.1.6"
+	id 'org.springframework.boot' version '4.0.0'
+	id "io.spring.dependency-management" version "1.1.7"
 	id 'war'
 	id 'eclipse'
 	id 'application'
 }
 
 group = 'de.jottyfan.bico'
-version = '0.2.8'
+version = '0.2.9'
 
 description = """BibleClassOrganizer"""
 
diff --git a/src/main/java/de/jottyfan/bico/modules/theme/ThemeRepository.java b/src/main/java/de/jottyfan/bico/modules/theme/ThemeRepository.java
index fdbb6b0..114ad63 100644
--- a/src/main/java/de/jottyfan/bico/modules/theme/ThemeRepository.java
+++ b/src/main/java/de/jottyfan/bico/modules/theme/ThemeRepository.java
@@ -15,6 +15,7 @@ import org.jboss.logging.Logger;
 import org.jooq.DSLContext;
 import org.jooq.DeleteConditionStep;
 import org.jooq.InsertOnDuplicateStep;
+import org.jooq.InsertResultStep;
 import org.jooq.Record1;
 import org.jooq.Record10;
 import org.jooq.Record4;
@@ -127,7 +128,19 @@ public class ThemeRepository {
 			.where(T_LESSON.FK_SLOT.eq(slotId));
 		// @formatter:on
 		LOGGER.trace(sql);
-		return sql.fetchOne();
+		TLessonRecord found = sql.fetchOne();
+		if (found == null) {
+			InsertResultStep<TLessonRecord> sqlI = jooq
+			// @formatter:off
+				.insertInto(T_LESSON,
+						        T_LESSON.FK_SLOT)
+				.values(slotId)
+				.returning();
+			// @formatter:on
+			LOGGER.trace(sqlI);
+			found = sqlI.fetchOne();
+		}
+		return found;
 	}
 
 	public void updateLesson(TLessonRecord bean) {
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index 6d37480..9fa7b1f 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -91,6 +91,8 @@ body {
 
 .tagju {
   background: linear-gradient(to bottom, lime, white);
+  left: -18px;
+  top: 22px;
 }
 
 [data-bs-theme=dark] .tagju {
diff --git a/src/main/resources/templates/next.html b/src/main/resources/templates/next.html
index f48dd76..b607e1c 100644
--- a/src/main/resources/templates/next.html
+++ b/src/main/resources/templates/next.html
@@ -4,16 +4,21 @@
 	<th:block layout:fragment="content">
 		<div class="borderdist">
 			<div class="container" th:if="${hasDateRole || hasBUrole}">
-				<div class="row">
-					<div class="col-md-6 col-sm-12"><a th:href="@{/next(groupname='bibleclass')}" class="btn btn-outline-secondary">nur Bibelunterricht</a></div>
-					<div class="col-md-6 col-sm-12"><a th:href="@{/next(groupname='youthgroup')}" class="btn btn-outline-secondary">nur Jungschar</a></div>
+				<div class="row d-flex justify-content-between">
+					<div class="col-auto">
+						<a th:href="@{/next(groupname='bibleclass')}" class="btn btn-outline-secondary">nur Bibelunterricht</a>
+					</div>
+					<div class="col-auto">
+						<a th:href="@{/next(groupname='youthgroup')}" class="btn btn-outline-secondary">nur Jungschar</a>
+					</div>
 				</div>
-				<div class="row">
-					<div class="col-sm-6 col-md-4 col-lg-2 card p-2 m-1" th:each="s : ${list}">
+				<div class="row g-2">
+					<div class="col-sm-6 col-md-4 col-lg-2 card p-2" th:each="s : ${list}">
 						<div class="tag tagbu" th:if="${s.isBibleclass}">Bibelunt.</div>
-						<div class="tag tagju" th:if="${s.isYouthgroup}">Jungsch.</div>
+						<div class="tag tagju" th:if="${s.isYouthgroup}">Jungschar</div>
 						<div class="tagfollow" th:text="${#temporals.format(s.day, 'dd.MM.yyyy')}"></div>
-						<div th:class="'tagfollow' + ${currentUserName == #strings.toLowerCase(s.fullname) ? ' tagemphasize' : ''}" th:text="${s.fullname}"></div>
+						<div th:class="'tagfollow' + ${currentUserName == #strings.toLowerCase(s.fullname) ? ' tagemphasize' : ''}" th:text="${s.fullname}" th:if="${s.fullname}"></div>
+						<div class="tagfollow" th:unless="${s.fullname}" style="min-height: 1.5em"></div>
 					</div>
 					<div class="alert alert-info" th:if="${list.size() < 1}">Es gibt noch keine neuen Termine oder Zusagen für Termine.</div>
 				</div>
diff --git a/src/main/resources/templates/theme.html b/src/main/resources/templates/theme.html
index a58eb59..7517e7b 100644
--- a/src/main/resources/templates/theme.html
+++ b/src/main/resources/templates/theme.html
@@ -51,7 +51,7 @@
 						</div>
 					</div>
 				</th:block>
-				<form th:action="@{/theme/update?slotId={id}(id=${slotId})}" method="post" th:object="${lesson}">
+				<form th:action="@{/theme/update?slotId={id}(id=${slotId})}" method="post" th:object="${lesson}" th:if="${lesson}">
 					<input type="hidden" th:field="*{pkLesson}" />
 					<div class="row g-2 blockframe">
 						<div class="col-sm-3">Anmerkungen zur Stunde</div>