diff --git a/faerun_calendar/static/faerun_calendar/css/main.css b/faerun_calendar/static/faerun_calendar/css/main.css
index b78c831..1ae032d 100644
--- a/faerun_calendar/static/faerun_calendar/css/main.css
+++ b/faerun_calendar/static/faerun_calendar/css/main.css
@@ -7,6 +7,9 @@ div.calendarpage {
 
 h2.year {
     text-align: center;
+    padding-bottom: 10px;
+    border-bottom: 1px solid black;
+    margin-bottom: 20px;
 }
 
 table.month, table.month th, table.month td {
@@ -33,7 +36,7 @@ table.month th.subtitle {
     font-weight: normal;
 }
 
-table.month td a {
+table.month a {
     text-decoration: none;
     color: black;
 }
@@ -42,14 +45,21 @@ table.month td.current a {
     color: white;
 }
 
-div.calendar,
-div.calendar-events,
-div.calendar-error {
+div.calendar {
+    column-width: 350px;
+}
+
+div.calendar-events {
     display: flex;
     flex-flow: row wrap;
     justify-content: space-around;
 }
 
+div.calendar-events > p,
+div.calendar-error > p {
+    text-align: center;
+}
+
 table.month {
     margin: 10px;
     width: 350px;
diff --git a/faerun_calendar/templates/faerun_calendar/index.html b/faerun_calendar/templates/faerun_calendar/index.html
index a1cb4c6..8a179e5 100644
--- a/faerun_calendar/templates/faerun_calendar/index.html
+++ b/faerun_calendar/templates/faerun_calendar/index.html
@@ -14,7 +14,7 @@
 <div class="calendarpage">
     {% if type == 'year' %}
         <h1 class="title">Календарь</h1>
-        <h2 class="year">{{year_data.number}}</h2>
+        <h2 class="year">Год {{year_data.number}}-й</h2>
 
         <div class="calendar">
             {% for month in month_data %}
@@ -25,7 +25,7 @@
         </div>
     {% elif type == 'day' %}
         <h1 class="title">Календарь — События</h1>
-        <h2 class="year">Год {{year_data.number}}, {{month_data.name}}, день {{day}}-й</h2>
+        <h2 class="year">Год {{year_data.number}}-й, {{month_data.name}}{% if not month_data.is_oneday %}, день {{day}}-й{% endif %}</h2>
 
         <div class="calendar-events">
             {% if events.count == 0 %}
diff --git a/faerun_calendar/templates/faerun_calendar/month.html b/faerun_calendar/templates/faerun_calendar/month.html
index b36c8c1..3d6c88c 100644
--- a/faerun_calendar/templates/faerun_calendar/month.html
+++ b/faerun_calendar/templates/faerun_calendar/month.html
@@ -1,7 +1,13 @@
 <div class="month">
     <table class="month">
         <tr>
-            <th colspan="10" class="title">{{month.name}}</th>
+            <th colspan="10" class="title">
+                {% if not month.is_oneday %}
+                    {{month.name}}
+                {% else %}
+                    <a href="{{year_data.number}}/{{month.number}}/{{1}}">{{month.name}}</a>
+                {% endif %}
+            </th>
         </tr>
         {% if month.folkname %}
             <th colspan="10" class="subtitle">{{month.folkname}}</th>