diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index a1f4217..8f372be 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -16,8 +16,8 @@ function Footer() {
           <Link to="/">{t('nav.home')}</Link>
           <Link to="/servers">{t('nav.servers')}</Link>
           <Link to="/blog">{t('nav.blog')}</Link>
-          <a href="https://git.cialloo.com">{t('nav.git')}</a>
-          <a href="/#forum">{t('nav.forum')}</a>
+          <a href="https://git.cialloo.com" target="_blank" rel="noopener noreferrer">{t('nav.git')}</a>
+          <Link to="/forum">{t('nav.forum')}</Link>
           <Link to="/friends">{t('nav.friends')}</Link>
         </div>
         <div className="footer-section">
diff --git a/src/components/Nav.tsx b/src/components/Nav.tsx
index 87f8635..eda0b02 100644
--- a/src/components/Nav.tsx
+++ b/src/components/Nav.tsx
@@ -19,10 +19,10 @@ function Nav({ currentPage }: NavProps) {
           </Link>
         </div>
         <div className="nav-links">
-          <a href="/" className={currentPage === 'home' ? 'active' : ''}>{t('nav.home')}</a>
+          <Link to="/" className={currentPage === 'home' ? 'active' : ''}>{t('nav.home')}</Link>
           <Link to="/servers" className={currentPage === 'servers' ? 'active' : ''}>{t('nav.servers')}</Link>
           <Link to="/blog" className={currentPage === 'blog' ? 'active' : ''}>{t('nav.blog')}</Link>
-          <a href="https://git.cialloo.com" className={currentPage === 'git' ? 'active' : ''}>{t('nav.git')}</a>
+          <a href="https://git.cialloo.com" target="_blank" rel="noopener noreferrer" className={currentPage === 'git' ? 'active' : ''}>{t('nav.git')}</a>
           <Link to="/forum" className={currentPage === 'forum' ? 'active' : ''}>{t('nav.forum')}</Link>
           <Link to="/friends" className={currentPage === 'friends' ? 'active' : ''}>{t('nav.friends')}</Link>
           <ThemeToggle />