diff --git a/templates/base.html b/templates/base.html
index 8dd48f50..97f84b20 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -14,7 +14,7 @@
     <body>
         <nav>
             <div class="left">
-                <img src="{{ url_for('static', filename='FixMeRYGLogo.jpg') }}" class="ryg-logo">
+                <img src="{{ url_for('static', filename='FixMeRYGLogo.jpg') }}" alt="" class="ryg-logo">
                 <b>Royalnet</b>
                 <a href="/">Home</a>
             </div>
@@ -26,10 +26,10 @@
                 {% endif %}
                 <span class="login-status">
                     {% if session.get('username') is not none %}
-                        <a href="/profile/{{ session.get('username') }}">{{ session.get('username') }}</a>
-                        <a class="btn" href="/logout">Logout</a>
+                        <a href="{{ url_for('page_profile', name=session.get('username')) }}">{{ session.get('username') }}</a>
+                        <a class="btn" href="{{ url_for('page_logout') }}">Logout</a>
                     {% else %}
-                        <a class="btn" href="/login">Login</a>
+                        <a class="btn" href="{{ url_for('page_login') }}">Login</a>
                     {% endif %}
                 </span>
             </div>
diff --git a/templates/main.html b/templates/main.html
index cf156ef2..30373de6 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -44,11 +44,19 @@
                 </div>
                 <div class="lower-box">
                     <ul>
-                        <li><a href="{{ g.rygconf['Telegram']['invite_link'] }}">Link di unione a Telegram</a></li>
-                        <li><a href="{{ g.rygconf['Discord']['invite_link'] }}">Link di invito a Discord</a></li>
+                        {% if g.rygconf['Telegram']['invite_link'] %}
+                            <li><a href="{{ g.rygconf['Telegram']['invite_link'] }}">Link di unione a Telegram</a></li>
+                        {% else %}
+                            <li><i>Link di unione a Telegram disattivato</i></li>
+                        {% endif %}
+                        {% if g.rygconf['Discord']['invite_link'] %}
+                            <li><a href="{{ g.rygconf['Discord']['invite_link'] }}">Link di invito a Discord</a></li>
+                        {% else %}
+                            <li><i>Link di invito a Discord disattivato</i></li>
+                        {% endif %}
                         <li><a href="https://steamcommunity.com/groups/royalgamescastle">Gruppo Steam Community</a></li>
                         <li><a href="https://new.reddit.com/r/RoyalGames/">/r/RoyalGames</a></li>
-                        <li><a href="/music">Statistiche su Royal Music</a></li>
+                        <li><a href="{{ url_for("page_music") }}">Statistiche su Royal Music</a></li>
                         <li><a href="http://amazon.steffo.eu/royal-music-cache/">File in cache di Royal Music</a></li>
                         <li><a href="/activity">Statistiche sull'attività</a></li>
                     </ul>
