diff --git a/faerun_calendar/templates/faerun_calendar/month.html b/faerun_calendar/templates/faerun_calendar/month.html
index 3d6c88c..252d0ad 100644
--- a/faerun_calendar/templates/faerun_calendar/month.html
+++ b/faerun_calendar/templates/faerun_calendar/month.html
@@ -25,7 +25,13 @@
                     <td>
                 {% endif %}
 
+                {% if root == 'calendar' %}
                 <a href="{{year_data.number}}/{{month.number}}/{{day}}">{{day}}</a>
+                {% elif root == 'year' %}
+                <a href="{{month.number}}/{{day}}">{{day}}</a>
+                {% elif root == 'month' %}
+                <a href="{{day}}">{{day}}</a>
+                {% endif %}
 
                 </td>
 
diff --git a/faerun_calendar/urls.py b/faerun_calendar/urls.py
index 61b7e6a..dd53bb3 100644
--- a/faerun_calendar/urls.py
+++ b/faerun_calendar/urls.py
@@ -5,6 +5,7 @@ from . import views
 urlpatterns = [
     path('', views.index, name='index'),
     path('<int:year>/', views.year_page, name='index'),
+    path('<int:year>/<int:month>/', views.month_page, name='index'),
     path('<int:year>/<int:month>/<int:day>/', views.day_page, name='index'),
 ]
 
diff --git a/faerun_calendar/views.py b/faerun_calendar/views.py
index 0aea9bc..8a5663e 100644
--- a/faerun_calendar/views.py
+++ b/faerun_calendar/views.py
@@ -71,6 +71,7 @@ def day_page(request, year: int, month: int, day: int):
     if not params:
         params = {
             'type': 'day',
+            'root': 'calendar',
             'year_data': year_data,
             'month_data': month_data,
             'day': day,
@@ -80,7 +81,14 @@ def day_page(request, year: int, month: int, day: int):
     return render(request, 'faerun_calendar/index.html', params)
 
 
-def year_page(request, year: int):
+def month_page(request, year: int, month: int):
+    return year_page(request, year, root='month')
+
+
+def year_page(request, year: int, root: str = None):
+    if not root:
+        root = 'year'
+
     params = None
 
     try:
@@ -95,6 +103,7 @@ def year_page(request, year: int):
 
         params = {
             'type': 'year',
+            'root': root,
             'calendar_data': calendar_data,
             'year_data': year_data,
             'month_data': month_data,