diff --git a/faerun_calendar/static/faerun_calendar/css/main.css b/faerun_calendar/static/faerun_calendar/css/main.css
index 89e5b43..e1d3513 100644
--- a/faerun_calendar/static/faerun_calendar/css/main.css
+++ b/faerun_calendar/static/faerun_calendar/css/main.css
@@ -9,6 +9,20 @@ div.content.calendar h2 {
     text-align: center;
 }
 
+div.content.calendar a.button.year {
+    margin: auto;
+}
+
+div.content.calendar a.arrow.left {
+    margin-left: auto;
+    margin-right: 40px;
+}
+
+div.content.calendar a.arrow.right {
+    margin-right: auto;
+    margin-left: 40px;
+}
+
 div.current-year {
     display: flex;
     justify-content: space-between;
@@ -35,7 +49,8 @@ table.month td {
     padding: 5px 0px;
 }
 
-table.month td.with_events {
+table.month td.with_events,
+table.month th.with_events {
     background: #0080c0;
 }
 
@@ -56,7 +71,8 @@ table.month a.current_day {
     border-radius: 50%;
 }
 
-table.month td.with_events a {
+table.month td.with_events a,
+table.month th.with_events a {
     color: #fefefe;
 }
 
diff --git a/faerun_calendar/templates/faerun_calendar/index.html b/faerun_calendar/templates/faerun_calendar/index.html
index ea83d0d..904dca8 100644
--- a/faerun_calendar/templates/faerun_calendar/index.html
+++ b/faerun_calendar/templates/faerun_calendar/index.html
@@ -48,7 +48,7 @@
             <a draggable="false" class="arrow left" disabled></a>
         {% endif %}
 
-        <h2 class="year">Год {{year_data.number}}-й, {{month_data.name}}{% if not month_data.is_oneday %}, день {{day}}-й{% endif %}</h2>
+            <h2 class="year"> <a draggable="false" class="button year" href="{{root}}{{year_data.number}}"><br>Год {{year_data.number}}-й</a><div>{{month_data.name}}{% if not month_data.is_oneday %}, день {{day}}-й{% endif %}</div></h2>
 
         {% if next_day %}
             <a draggable="false" class="arrow right" href="{{root}}{{next_day.year}}/{{next_day.month}}/{{next_day.day}}"></a>
diff --git a/faerun_calendar/templates/faerun_calendar/month.html b/faerun_calendar/templates/faerun_calendar/month.html
index 363e34c..386c320 100644
--- a/faerun_calendar/templates/faerun_calendar/month.html
+++ b/faerun_calendar/templates/faerun_calendar/month.html
@@ -1,12 +1,17 @@
 <div class="month">
     <table class="month">
         <tr>
+            {% if not month.is_oneday %}
             <th colspan="10" class="title">
-                {% if not month.is_oneday %}
-                    {{month.name}}
+                {{month.name}}
+            {% else %}
+                {% if month.days.0.event_counts %}
+            <th colspan="10" class="title with_events">
                 {% else %}
-                    <a href="{{year_data.number}}/{{month.number}}/{{1}}">{{month.name}}</a>
+            <th colspan="10" class="title">
                 {% endif %}
+                <a href="{{root}}{{year_data.number}}/{{month.number}}/{{1}}">{{month.name}}</a>
+            {% endif %}
             </th>
         </tr>
         {% if month.folkname %}