diff --git a/src/Routes/Main.php b/src/Routes/Main.php
index a15ffbcf45..b3f2be7e10 100644
--- a/src/Routes/Main.php
+++ b/src/Routes/Main.php
@@ -61,8 +61,8 @@ abstract class Main
         }
 
         // Settings pages
-        $r->connect('settings', '/settings', RedirectController::class, [], ['defaults' => ['route' => 'settings_profile']]);
-        foreach (['profile', 'avatar', 'misc', 'account'] as $s) {
+        $r->connect('settings', '/settings', RedirectController::class, [], ['defaults' => ['route' => 'settings_personal_info']]);
+        foreach (['personal_info', 'avatar', 'misc', 'account'] as $s) {
             $r->connect('settings_' . $s, '/settings/' . $s, [C\UserPanel::class, $s]);
         }
     }
diff --git a/templates/left/left.html.twig b/templates/left/left.html.twig
index b038d9a26f..abf07ba611 100644
--- a/templates/left/left.html.twig
+++ b/templates/left/left.html.twig
@@ -42,7 +42,7 @@
                     <a href='#'>Replies</a>
                     <a href='#'>Favourites</a>
                     <a href='#'>Reverse Favs</a>
-                    <a href="{{ path('settings_profile') }}" class='hover-effect {% if app.request.attributes.get('_route') starts with 'settings_' %}active{% endif %}'>Settings</a>
+                    <a href="{{ path('settings_personal_info') }}" class='hover-effect {% if app.request.attributes.get('_route') starts with 'settings_' %}active{% endif %}'>Settings</a>
                     <a href='#'>Logout</a>
                 </div>
                 <div class="footer">
@@ -66,7 +66,7 @@
             <div class='navbar'>
                 <div class="left-nav">
                     <a href="{{ path('login') }}" class='hover-effect {{ active('login') }}'>Login</a>
-                    <a href='#'>Register</a>
+                    <a href="{{ path('register') }}">Register</a>
                 </div>
                 <div class="footer">
                     <a href="{{ path('doc_faq') }}" class='hover-effect {{ active('doc_faq') }}'>FAQ</a>
@@ -79,4 +79,4 @@
         </div>
     {% endif %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/settings/account.html.twig b/templates/settings/account.html.twig
index 8d1ec5aba9..031f83a475 100644
--- a/templates/settings/account.html.twig
+++ b/templates/settings/account.html.twig
@@ -16,7 +16,7 @@
       <nav class='set-nav'>
             <ul>
                   <li>
-                        <a href="{{ path('settings_profile') }}" class='hover-effect {% if (app.request.attributes.get('_route') starts with 'settings_profile') or (app.request.attributes.get('_route') starts with 'settings_avatar')%}active{% endif %}'>Settings</a>
+                        <a href="{{ path('settings_personal_info') }}" class='hover-effect {% if (app.request.attributes.get('_route') starts with 'settings_personal_info') or (app.request.attributes.get('_route') starts with 'settings_avatar')%}active{% endif %}'>Settings</a>
                   </li>
                   <li>
                         <a href="{{ path('settings_account') }}" class='hover-effect {% if app.request.attributes.get('_route') starts with 'settings_account' %}active{% endif %}'>Account</a>
diff --git a/templates/settings/avatar.html.twig b/templates/settings/avatar.html.twig
index 962e1dbb34..9fa2ae2919 100644
--- a/templates/settings/avatar.html.twig
+++ b/templates/settings/avatar.html.twig
@@ -16,7 +16,7 @@
             <nav class='set-nav'>
                   <ul>
                         <li>
-                              <a href="{{ path('settings_profile') }}" class='hover-effect {% if (app.request.attributes.get('_route') starts with 'settings_profile') or (app.request.attributes.get('_route') starts with 'settings_avatar')%}active{% endif %}'>Settings</a>
+                              <a href="{{ path('settings_personal_info') }}" class='hover-effect {% if (app.request.attributes.get('_route') starts with 'settings_profile') or (app.request.attributes.get('_route') starts with 'settings_avatar')%}active{% endif %}'>Settings</a>
                         </li>
                         <li>
                               <a href="{{ path('settings_account') }}" class='hover-effect {% if app.request.attributes.get('_route') starts with 'settings_account' %}active{% endif %}'>Account</a>
@@ -29,7 +29,7 @@
             <nav class='set-nav2'>
                   <ul>
                         <li>
-                              <a href="{{ path('settings_profile') }}" class='hover-effect {% if app.request.attributes.get('_route') starts with 'settings_profile' %}active{% endif %}'>Profile</a>
+                              <a href="{{ path('settings_personal_info') }}" class='hover-effect {% if app.request.attributes.get('_route') starts with 'settings_profile' %}active{% endif %}'>Profile</a>
                         </li>
                         <li>
                               <a href="{{ path('settings_avatar') }}" class='hover-effect {% if app.request.attributes.get('_route') starts with 'settings_avatar' %}active{% endif %}'>Avatar</a>
diff --git a/templates/settings/misc.html.twig b/templates/settings/misc.html.twig
index a1a12e4225..83870513f3 100644
--- a/templates/settings/misc.html.twig
+++ b/templates/settings/misc.html.twig
@@ -16,7 +16,7 @@
         <nav class='set-nav'>
             <ul>
                 <li>
-                    <a href="{{ path('settings_profile') }}" class='hover-effect {% if (app.request.attributes.get('_route') starts with 'settings_profile') or (app.request.attributes.get('_route') starts with 'settings_avatar')%}active{% endif %}'>Settings</a>
+                    <a href="{{ path('settings_personal_info') }}" class='hover-effect {% if (app.request.attributes.get('_route') starts with 'settings_profile') or (app.request.attributes.get('_route') starts with 'settings_avatar')%}active{% endif %}'>Settings</a>
                 </li>
                 <li>
                     <a href="{{ path('settings_account') }}" class='hover-effect {% if app.request.attributes.get('_route') starts with 'settings_account' %}active{% endif %}'>Account</a>
diff --git a/templates/settings/profile.html.twig b/templates/settings/profile.html.twig
index 5e11b3c176..d9de08b1dd 100644
--- a/templates/settings/profile.html.twig
+++ b/templates/settings/profile.html.twig
@@ -16,7 +16,7 @@
     <nav class='set-nav'>
       <ul>
         <li>
-          <a href="{{ path('settings_profile') }}" class='hover-effect {{ active('settings_profile', 'settings_avatar') }}'>Settings</a>
+          <a href="{{ path('settings_personal_info') }}" class='hover-effect {{ active('settings_personal_info', 'settings_avatar') }}'>Settings</a>
         </li>
         <li>
           <a href="{{ path('settings_account') }}" class='hover-effect {{ active('settings_account') }}'>Account</a>
@@ -32,7 +32,7 @@
         {# {% endfor %} #}
         
         <li>
-          <a href="{{ path('settings_profile') }}" class='hover-effect {{ active('settings_profile') }}'>Profile</a>
+          <a href="{{ path('settings_personal_info') }}" class='hover-effect {{ active('settings_profile') }}'>Profile</a>
         </li>
         <li>
           <a href="{{ path('settings_avatar') }}" class='hover-effect {{ active('settings_avatar') }}'>Avatar</a>