diff --git a/src/components/AcademyLocation/AcademyLocationSection.tsx b/src/components/AcademyLocation/AcademyLocationSection.tsx
index f96e9ee..5d97a11 100755
--- a/src/components/AcademyLocation/AcademyLocationSection.tsx
+++ b/src/components/AcademyLocation/AcademyLocationSection.tsx
@@ -2,7 +2,6 @@ import React from 'react';
 import classnames from 'classnames';
 import styles from './AcademyLocationSection.module.scss';
 import { Academy } from '../../core/models';
-import Link from '../Link/Link';
 
 interface AcademyLocationSectionProps {
     academies: Academy[]
@@ -35,7 +34,6 @@ function AcademyLocation(academy: Academy) {
                 <h1>{academy.date}</h1>
                 <a target="_blank" rel="noopener noreferrer" className={styles.location} href={academy.locationUrl}>{academy.location}</a>
                 <span className={styles.slots}>{academy.slots} students</span>
-                <Link url={`/academy/registration?city=${academy.name.toLowerCase()}`}>Registration</Link>
             </div>
         </div>
     )
diff --git a/src/components/Link/Link.module.scss b/src/components/Link/Link.module.scss
index 4cb3856..757d44f 100755
--- a/src/components/Link/Link.module.scss
+++ b/src/components/Link/Link.module.scss
@@ -11,14 +11,13 @@
     background: none;
     text-align: center;
     cursor: pointer;
-    a {
-        color: $color-logo-red;
-        text-decoration: none;
-    }
+    text-decoration: none; 
+    color: $color-logo-red;
+    
     &:hover {
+        text-decoration: none; 
         background: $color-logo-red-dark;
-        a {
-            color: white;
-        }
+        color: white;
+         
     }
 }
\ No newline at end of file
diff --git a/src/components/Link/Link.tsx b/src/components/Link/Link.tsx
index 7df8b5f..524404f 100755
--- a/src/components/Link/Link.tsx
+++ b/src/components/Link/Link.tsx
@@ -12,14 +12,16 @@ interface LinkProps {
 function Link(props: LinkProps) {
     return (
         props.external 
-            ? <div className={styles.link}>
-                <a href={props.url} target={props.noBlankTarget ? '' : '_blank'}>{props.children}</a>
-            </div>
-            : <div className={styles.link}>
-                <RouterLink to={props.url}>
+            ?   <a href={props.url} className={styles.link} target={props.noBlankTarget ? '' : '_blank'}>
+                    <span >{props.children}</span>
+                </a>
+            : 
+                <RouterLink to={props.url} className={styles.link}>
+                   <span >
                     {props.children}
+                    </span>
                 </RouterLink>
-            </div>
+            
     )
 }