diff --git a/components/bookingTable.tsx b/components/bookingTable.tsx
index 3f9e025..cf01be4 100644
--- a/components/bookingTable.tsx
+++ b/components/bookingTable.tsx
@@ -27,8 +27,8 @@ export default function BookingTable({
     {
       name: 'Email',
       value: (
-        <Link href={`mailto:${booking.email}`}>
-          <a className="link">{booking.email}</a>
+        <Link href={`mailto:${booking.email}`} className="link">
+          {booking.email}
         </Link>
       ),
     },
@@ -42,8 +42,8 @@ export default function BookingTable({
     >
       <div className="px-4 py-5 sm:px-6">
         <h3 className="text-lg leading-6 font-medium text-gray-900">
-          <Link href={`/admin/bookings/${booking.uuid}`}>
-            <a className="link">Booking {booking.uuid}</a>
+          <Link href={`/admin/bookings/${booking.uuid}`} className="link">
+            Booking {booking.uuid}
           </Link>
         </h3>
         <p className="mt-1 max-w-2xl text-sm text-gray-500">
diff --git a/components/footer.tsx b/components/footer.tsx
index ef7da38..87519a9 100644
--- a/components/footer.tsx
+++ b/components/footer.tsx
@@ -7,21 +7,19 @@ export default function Footer() {
     <footer>
       <div className="flex flex-col sm:flex-row max-w-7xl mx-auto px-4 sm:px-6 my-5">
         <div className="flex-grow">
-          <Link href="/">
-            <a className="underline">
+          <Link href="/" className="underline">
               <Logo className="h-12 w-auto sm:h-14" />
-            </a>
           </Link>
         </div>
         <ul className="flex flex-col gap-2 sm:flex-row sm:items-end ">
           <li>
-            <Link href="/privacy">
-              <a className="underline">Datenschutzerklärung</a>
+            <Link href="/privacy" className="underline">
+              Datenschutzerklärung
             </Link>
           </li>
           <li>
-            <Link href="/impressum">
-              <a className="underline">Impressum</a>
+            <Link href="/impressum" className="underline">
+              Impressum
             </Link>
           </li>
         </ul>
diff --git a/components/header.tsx b/components/header.tsx
index 2e314b9..cc39d55 100644
--- a/components/header.tsx
+++ b/components/header.tsx
@@ -43,10 +43,8 @@ export default function Header() {
         <div className="max-w-7xl mx-auto px-4 sm:px-6">
           <div className="relative flex justify-between items-center border-b-2 border-gray-100 py-6 md:justify-start md:space-x-10">
             <div className="flex justify-start lg:w-0 flex-1">
-              <Link href="/">
-                <a className="text-lg tracking-tight font-extrabold text-blue-800 sm:text-xl md:text-2xl">
+              <Link href="/" className="text-lg tracking-tight font-extrabold text-blue-800 sm:text-xl md:text-2xl">
                   Pfadi-Bussle
-                </a>
               </Link>
             </div>
             <nav className="hidden space-x-10 sm:flex">
diff --git a/components/navigation.tsx b/components/navigation.tsx
index 745711f..a87120a 100644
--- a/components/navigation.tsx
+++ b/components/navigation.tsx
@@ -37,10 +37,8 @@ export default function Navigation() {
           <span className="font-extrabold">{pathLabel}</span>
         </h2>
         {status === 'authenticated' && data.user.email && (
-          <Link href="/admin">
-            <a className="text-gray-300 hover:bg-gray-700 hover:text-white px-3 py-2 rounded-md text-sm font-medium">
+          <Link href="/admin" className="text-gray-300 hover:bg-gray-700 hover:text-white px-3 py-2 rounded-md text-sm font-medium">
               Buchungen
-            </a>
           </Link>
         )}
         <div className="flex-grow" />
diff --git a/pages/admin/bookings/[uuid]/index.tsx b/pages/admin/bookings/[uuid]/index.tsx
index ba0794b..211127c 100644
--- a/pages/admin/bookings/[uuid]/index.tsx
+++ b/pages/admin/bookings/[uuid]/index.tsx
@@ -66,8 +66,8 @@ function ShowBookingAdmin({ booking: bookingProp }: { booking: Booking }) {
         >
           Buchung Abweisen
         </button>
-        <Link href={`${router.asPath}/bill`}>
-          <a className="btn btn-gray">Rechnung</a>
+        <Link href={`${router.asPath}/bill`} className="btn btn-gray">
+          Rechnung
         </Link>
       </div>
     </>
diff --git a/pages/bookings/[uuid]/stored.tsx b/pages/bookings/[uuid]/stored.tsx
index 440d52d..7cddd1d 100644
--- a/pages/bookings/[uuid]/stored.tsx
+++ b/pages/bookings/[uuid]/stored.tsx
@@ -27,8 +27,8 @@ export default function ShowBookingStored({ booking }: { booking: Booking }) {
       </p>
       <p>
         Den{' '}
-        <Link href={`/bookings/${booking.uuid}`}>
-          <a className="link underline">Link</a>
+        <Link href={`/bookings/${booking.uuid}`} className="link underline">
+          Link
         </Link>{' '}
         zur Buchung schicken wir Dir auch per E-Mail. Dort kann die Buchung auch
         jederzeit storniert werden.
diff --git a/pages/index.tsx b/pages/index.tsx
index 5b1ea19..ea57096 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -19,20 +19,18 @@ export default function Home() {
         dritte Sitzreihe können ausgebaut werden.
       </p>
       <p className="mt-3 text-gray-500 sm:mt-5 sm:text-lg md:text-xl">
-        <Link href="/prices">
-          <a className="underline hover:text-blue-700">Preise</a>
+        <Link href="/prices" className="underline hover:text-blue-700">
+          Preise
         </Link>{' '}
         und{' '}
-        <Link href="/terms">
-          <a className="underline hover:text-blue-700">Mietbedingungen</a>
+        <Link href="/terms" className="underline hover:text-blue-700">
+          Mietbedingungen
         </Link>
       </p>
       <div className="mt-5 sm:mt-8 sm:flex sm:justify-center">
         <div className="rounded-md shadow">
-          <Link href="/book">
-            <a className="w-full flex items-center justify-center px-6 py-2 border border-transparent text-base font-medium rounded-md text-white bg-blue-800 hover:bg-blue-900 md:py-2 md:text-lg md:px-5">
-              Zur Buchungsanfrage
-            </a>
+          <Link href="/book" className="w-full flex items-center justify-center px-6 py-2 border border-transparent text-base font-medium rounded-md text-white bg-blue-800 hover:bg-blue-900 md:py-2 md:text-lg md:px-5">
+            Zur Buchungsanfrage
           </Link>
         </div>
       </div>
@@ -53,17 +51,15 @@ export default function Home() {
           0151 / 21225302
         </a>{' '}
         oder{' '}
-        <Link href="https://wa.me/4915121225362">
-          <a className="underline inline-flex flex-row items-baseline hover:text-blue-700">
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              className="fill-current h-4 inline"
-              viewBox="0 0 738 741"
-            >
-              <title>Whatsapp</title>
-              <path d="M630 108A368 368 0 0052 551L0 741l195-51a368 368 0 00435-582M370 672c-55 0-108-14-155-42l-11-7-116 31 31-113-7-12A304 304 0 01370 62a303 303 0 01306 305c-1 169-137 305-306 305m168-228l-63-30c-8-3-15-4-21 5l-29 36c-5 6-10 7-20 2-9-5-38-14-73-46-28-24-46-54-51-63-6-9-1-14 4-19l13-16c5-5 7-9 10-15s1-12-1-16l-28-68c-8-18-15-16-21-16h-18c-6 0-16 2-24 11-9 9-32 31-32 77s33 88 37 94c5 7 65 99 157 139l52 19c22 7 42 6 58 4 18-3 54-22 62-44 8-21 8-40 5-43-2-4-8-6-17-11" />
-            </svg>
-          </a>
+        <Link href="https://wa.me/4915121225362" className="underline inline-flex flex-row items-baseline hover:text-blue-700">
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            className="fill-current h-4 inline"
+            viewBox="0 0 738 741"
+          >
+            <title>Whatsapp</title>
+            <path d="M630 108A368 368 0 0052 551L0 741l195-51a368 368 0 00435-582M370 672c-55 0-108-14-155-42l-11-7-116 31 31-113-7-12A304 304 0 01370 62a303 303 0 01306 305c-1 169-137 305-306 305m168-228l-63-30c-8-3-15-4-21 5l-29 36c-5 6-10 7-20 2-9-5-38-14-73-46-28-24-46-54-51-63-6-9-1-14 4-19l13-16c5-5 7-9 10-15s1-12-1-16l-28-68c-8-18-15-16-21-16h-18c-6 0-16 2-24 11-9 9-32 31-32 77s33 88 37 94c5 7 65 99 157 139l52 19c22 7 42 6 58 4 18-3 54-22 62-44 8-21 8-40 5-43-2-4-8-6-17-11" />
+          </svg>
         </Link>
       </p>
     </div>