diff --git a/src/views/Register.vue b/src/views/Register.vue
index 2e371a1..e1dc010 100644
--- a/src/views/Register.vue
+++ b/src/views/Register.vue
@@ -20,18 +20,18 @@
       <p class="mx-auto leading-relaxed text-lg text-center font-medium mb-4">
         {{ $t("register.register_now") }}
       </p>
-      <p v-if="state.org_name !== ''" class="mx-auto leading-relaxed text-base text-center font-medium">
-        {{ $t("organization") }}: {{ state.org_name }}
-      </p>
-      <p v-if="state.org_name !== '' && state.org_teams.length > 0"
-        class="mx-auto leading-relaxed text-base text-center">
+      <div v-if="state.org_name !== ''" class="w-full text-center">
+        <span
+          class="inline-flex items-center gap-x-1.5 py-1.5 px-3 rounded-lg mx-auto font-medium bg-blue-100 text-blue-800 dark:bg-blue-800/30 dark:text-blue-500">{{ state.org_name }}</span>
+      </div>
+      <label v-if="state.org_name !== '' && state.org_teams.length > 0" for="select_team" class="block font-semibold mt-2">
         Team:
-      </p>
-      <select v-model="org_team" v-if="state.org_name !== '' && state.org_teams.length > 0" class="
+      </label>
+      <select id="select_team" v-model="org_team" v-if="state.org_name !== '' && state.org_teams.length > 0" class="
           w-full
-          border
+          border-2
           bg-white
-          rounded
+          rounded-md
           px-3
           py-2
           outline-none
@@ -47,9 +47,11 @@
           {{ t.name }}
         </option>
       </select>
-      <p v-if="state.org_name === ''" class="mx-auto leading-relaxed text-base text-center">
-        {{ $t('buergerlauf') }}
-      </p>
+      <div v-if="state.org_name === ''" class="w-full text-center">
+        <span
+          class="inline-flex items-center gap-x-1.5 py-1.5 px-3 rounded-lg mx-auto font-medium bg-blue-100 text-blue-800 dark:bg-blue-800/30 dark:text-blue-500">{{
+            $t('buergerlauf') }}</span>
+      </div>
       <div class="mt-4">
         <label for="first_name" class="block font-semibold mt-2">
           {{ $t("vorname") }}