diff --git a/config/settings.py b/config/settings.py
index f39c5b4..8d8ff76 100644
--- a/config/settings.py
+++ b/config/settings.py
@@ -159,8 +159,8 @@ AUTH_PASSWORD_VALIDATORS = [
 
 gettext = lambda s: s
 LANGUAGES = (
-    ('ru', gettext('Russia')),
     ('en', gettext('English')),
+    ('ru', gettext('Russia')),
 )
 LOCALE_PATHS = (
     os.path.join(BASE_DIR, 'locale'),
diff --git a/static/js/dashboard.js b/static/js/dashboard.js
deleted file mode 100644
index bc0dafb..0000000
--- a/static/js/dashboard.js
+++ /dev/null
@@ -1,264 +0,0 @@
-const malesCount = {{ males_count }}
-const femalesCount = {{ females_count }}
-
-$(document).ready(function () {
-
-    // Setup
-    const labels = [
-        gettext('January'),
-        gettext('February'),
-        gettext('March'),
-        gettext('April'),
-        gettext('May'),
-        gettext('June'),
-    ];
-    const data = {
-        labels: labels,
-        datasets: [{
-            label: gettext('Students'),
-            backgroundColor: 'rgba(86, 224, 224, 0.5)',
-            borderColor: 'rgb(86, 224, 224)',
-            hoverBorderWidth: 3,
-            data: [0, 10, 5, 2, 20, 30, 45]
-        }, {
-            label: gettext('Teachers'),
-            backgroundColor: 'rgba(253, 174, 28, 0.5)',
-            borderColor: 'rgb(253, 174, 28)',
-            hoverBorderWidth: 3,
-            data: [20, 0, 15, 4, 6, 4, 60],
-        }, {
-            label: gettext('Admins'),
-            backgroundColor: 'rgba(203, 31, 255, 0.5)',
-            borderColor: 'rgb(203, 31, 255)',
-            hoverBorderWidth: 3,
-            data: [85, 30, 34, 20, 20, 55, 45],
-        }, {
-            label: gettext('Stuffs'),
-            backgroundColor: 'rgba(255, 19, 157, 0.5)',
-            borderColor: 'rgb(255, 19, 157)',
-            hoverBorderWidth: 3,
-            data: [45, 75, 70, 80, 20, 30, 90],
-        }]
-    };
-
-    var traffic = document.getElementById('traffic');
-    var chart = new Chart(traffic, {
-        type: 'line',
-        data: data,
-        options: {
-            plugins: {
-                title: {
-                    display: true,
-                    text: gettext('Website Traffic'),
-                    padding: 15
-                }
-            }
-        }
-    });
-
-    // Setup
-    const labelsEnrollment = [
-        '2016',
-        '2017',
-        '2018',
-        '2019',
-        '2020',
-        '2021',
-    ];
-    const dataEnrollment = {
-        labels: labelsEnrollment,
-        datasets: [{
-            label: gettext('Comp.S'),
-            backgroundColor: 'rgba(86, 224, 224, 0.5)',
-            borderColor: 'rgb(86, 224, 224)',
-            hoverBorderWidth: 3,
-            data: [0, 10, 5, 2, 20, 30, 45]
-        }, {
-            label: gettext('Architecture'),
-            backgroundColor: 'rgba(253, 174, 28, 0.5)',
-            borderColor: 'rgb(253, 174, 28)',
-            hoverBorderWidth: 3,
-            data: [20, 0, 15, 4, 6, 4, 60],
-        }, {
-            label: gettext('Civil Eng'),
-            backgroundColor: 'rgba(203, 31, 255, 0.5)',
-            borderColor: 'rgb(203, 31, 255)',
-            hoverBorderWidth: 3,
-            data: [85, 30, 34, 20, 20, 55, 45],
-        }, {
-            label: gettext('Accounting'),
-            backgroundColor: 'rgba(255, 19, 157, 0.5)',
-            borderColor: 'rgb(255, 19, 157)',
-            hoverBorderWidth: 3,
-            data: [45, 75, 70, 80, 20, 30, 90],
-        }, {
-            label: gettext('Business M.'),
-            backgroundColor: 'rgba(0, 0, 0, 0.5)',
-            borderColor: 'rgb(0, 0, 0)',
-            hoverBorderWidth: 3,
-            data: [15, 75, 45, 90, 60, 30, 90],
-        }]
-    };
-
-    var enrollement = document.getElementById('enrollement');
-    var chart = new Chart(enrollement, {
-        type: 'bar',
-        data: dataEnrollment,
-        options: {
-            plugins: {
-                title: {
-                    display: true,
-                    text: gettext('Enrollment per course'),
-                    padding: 20
-                }
-            }
-        }
-    });
-
-    // Average grade setup
-    const labelsGrade = [
-        '2017',
-        '2018',
-        '2019',
-        '2020',
-        '2022',
-    ];
-    const dataGrade = {
-        labels: labelsGrade,
-        datasets: [{
-            label: gettext("Comp sci."),
-            backgroundColor: 'rgba(86, 224, 224, 0.5)',
-            borderColor: 'rgb(86, 224, 224)',
-            hoverBorderWidth: 3,
-            data: [0, 10, 5, 2, 20, 30, 45]
-        }, {
-            label: gettext("Civil eng."),
-            backgroundColor: 'rgba(253, 174, 28, 0.5)',
-            borderColor: 'rgb(253, 174, 28)',
-            hoverBorderWidth: 3,
-            data: [20, 0, 15, 4, 6, 4, 60],
-        }, {
-            label: gettext("Architect."),
-            backgroundColor: 'rgba(203, 31, 255, 0.5)',
-            borderColor: 'rgb(203, 31, 255)',
-            hoverBorderWidth: 3,
-            data: [85, 30, 34, 20, 20, 55, 45],
-        }, {
-            label: gettext("Economics"),
-            backgroundColor: 'rgba(255, 19, 157, 0.5)',
-            borderColor: 'rgb(255, 19, 157)',
-            hoverBorderWidth: 3,
-            data: [45, 75, 70, 80, 20, 30, 90],
-        }]
-    };
-    
-    var students_grade = document.getElementById('students_grade');
-    var chart = new Chart(students_grade, {
-        type: 'bar',
-        data: dataGrade,
-        options: {
-            plugins: {
-                title: {
-                    display: true,
-                    text: gettext('Students average grade (performance)'),
-                    padding: 20
-                }
-            }
-        }
-    });
-
-    const dataGender = {
-        labels: [
-            gettext('Man'),
-            gettext('Women')
-        ],
-        datasets: [{
-            label: gettext("Students Gender Dataset"),
-            data: [malesCount, femalesCount],
-            backgroundColor: [
-            'rgb(255, 99, 132)',
-            'rgb(54, 162, 235)'
-            ],
-            hoverOffset: 4
-        }]
-    };
-
-    var gender = document.getElementById('gender');
-    var chart = new Chart(gender, {
-        type: 'pie',
-        data: dataGender,
-        options: {
-            plugins: {
-                title: {
-                    display: true,
-                    text: gettext('Students Gender'),
-                    padding: 20
-                }
-            }
-        }
-    });
-
-    const dataQualification = {
-        labels: [
-            gettext('PHD'),
-            gettext('Masters'),
-            gettext('BSc degree')
-        ],
-        datasets: [{
-            label: gettext("Lecturer Qualifications Dataset"),
-            data: [24, 30, 26],
-            backgroundColor: [
-            'rgb(255, 99, 132)',
-            'rgb(255, 193, 7)',
-            'rgb(54, 162, 235)'
-            ],
-            hoverOffset: 4
-        }]
-    };
-    var ethnicity = document.getElementById('ethnicity');
-    var chart = new Chart(ethnicity, {
-        type: 'pie',
-        data: dataQualification,
-        options: {
-            plugins: {
-                title: {
-                    display: true,
-                    text: gettext('Lecturer qualifications'),
-                    padding: 20
-                }
-            }
-        }
-    });
-
-    const dataLevels = {
-        labels: [
-            gettext('PHD'),
-            gettext('Masters'),
-            gettext('BSc degree')
-        ],
-        datasets: [{
-            label: gettext("Students level"),
-            data: [14, 30, 56],
-            backgroundColor: [
-            'rgb(255, 99, 132)',
-            'rgb(255, 193, 7)',
-            'rgb(54, 162, 235)'
-            ],
-            hoverOffset: 4
-        }]
-    };
-    var language = document.getElementById('language');
-    var chart = new Chart(language, {
-        type: 'pie',
-        data: dataLevels,
-        options: {
-            plugins: {
-                title: {
-                    display: true,
-                    text: gettext('Student levels'),
-                    padding: 20
-                }
-            }
-        }
-    });
-})
diff --git a/templates/500.html b/templates/500.html
index 87244e8..93a1ef3 100644
--- a/templates/500.html
+++ b/templates/500.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block content %}
 <div class="text-center mt-5">
-    <h1>{% trans 'Server error' }%</h1>
+    <h1>{% trans 'Server error' %}</h1>
     <p>{% trans 'Please try again later.' %}</p>
     <a href="/" class="link">&LeftArrow; {% trans 'Return to the app' %}</a>
 </div>
diff --git a/templates/accounts/add_staff.html b/templates/accounts/add_staff.html
index 3b0f670..14c7818 100644
--- a/templates/accounts/add_staff.html
+++ b/templates/accounts/add_staff.html
@@ -34,7 +34,7 @@
             </div>
         </div>
     </div>
-    <input class="btn btn-primary" type="{% trans 'submit' %}" value="Save">
+    <input class="btn btn-primary" type="submit" value="{% trans 'Save' %}">
 </form>
 
 {% endblock content %}
diff --git a/templates/accounts/add_student.html b/templates/accounts/add_student.html
index e430b2b..450fb39 100644
--- a/templates/accounts/add_student.html
+++ b/templates/accounts/add_student.html
@@ -46,7 +46,7 @@
         </div>
     </div>
 
-    <input class="btn btn-primary" type="{% trans 'submit' %}" value="Save">
+    <input class="btn btn-primary" type="submit" value="{% trans 'Save' %}">
 </form>
 
 {% endblock content %}
diff --git a/templates/accounts/edit_lecturer.html b/templates/accounts/edit_lecturer.html
index 3f232a7..7516b78 100644
--- a/templates/accounts/edit_lecturer.html
+++ b/templates/accounts/edit_lecturer.html
@@ -43,6 +43,6 @@
             </div>
         </div>
     </div>
-    <input class="btn btn-primary" type="{% trans 'submit' %}" value="Save">
+    <input class="btn btn-primary" type="submit" value="{% trans 'Save' %}">
 </form>
 {% endblock content %}
diff --git a/templates/accounts/edit_student.html b/templates/accounts/edit_student.html
index f39c2b8..b8bb65c 100644
--- a/templates/accounts/edit_student.html
+++ b/templates/accounts/edit_student.html
@@ -43,6 +43,6 @@
             </div>
         </div>
     </div>
-    <input class="btn btn-primary" type="{% trans 'submit' %}" value="Save">
+    <input class="btn btn-primary" type="submit" value="{% trans 'Save' %}">
 </form>
 {% endblock content %}
diff --git a/templates/accounts/parent_form.html b/templates/accounts/parent_form.html
index 64ac64e..b9df7df 100644
--- a/templates/accounts/parent_form.html
+++ b/templates/accounts/parent_form.html
@@ -8,7 +8,7 @@
 
 <form method="POST">{% csrf_token %}
 	{{ form.as_p }}
-	<input type="{% trans 'submit' %}" name="" value="Save">
+	<input type="submit" name="" value="{% trans 'Save' %}">
 </form>
 
 {% endblock %}
diff --git a/templates/accounts/profile.html b/templates/accounts/profile.html
index ccbd5e0..0c48569 100644
--- a/templates/accounts/profile.html
+++ b/templates/accounts/profile.html
@@ -27,7 +27,7 @@
                 <ul class="px-2 list-unstyled">
                     <li>{{ user.get_full_name|title }}</li>
                     <li><strong>{% trans 'Last login:' %} </strong>{{ user.last_login|date }}</li>
-                    <li><strong>{% trans 'Role:' %}' </strong>
+                    <li><strong>{% trans 'Role:' %} </strong>
                         {{ user.get_user_role }}
                     </li>
                 </ul>
diff --git a/templates/core/dashboard.html b/templates/core/dashboard.html
index 981a10e..8a2da43 100644
--- a/templates/core/dashboard.html
+++ b/templates/core/dashboard.html
@@ -317,5 +317,272 @@
 		}
 	})
 </script>
+<script>
+	const malesCount = {{ males_count }}
+const femalesCount = {{ females_count }}
+
+$(document).ready(function () {
+
+    // Setup
+    const labels = [
+        gettext('January'),
+        gettext('February'),
+        gettext('March'),
+        gettext('April'),
+        gettext('May'),
+        gettext('June'),
+    ];
+    const data = {
+        labels: labels,
+        datasets: [{
+            label: gettext('Students'),
+            backgroundColor: 'rgba(86, 224, 224, 0.5)',
+            borderColor: 'rgb(86, 224, 224)',
+            hoverBorderWidth: 3,
+            data: [0, 10, 5, 2, 20, 30, 45]
+        }, {
+            label: gettext('Teachers'),
+            backgroundColor: 'rgba(253, 174, 28, 0.5)',
+            borderColor: 'rgb(253, 174, 28)',
+            hoverBorderWidth: 3,
+            data: [20, 0, 15, 4, 6, 4, 60],
+        }, {
+            label: gettext('Admins'),
+            backgroundColor: 'rgba(203, 31, 255, 0.5)',
+            borderColor: 'rgb(203, 31, 255)',
+            hoverBorderWidth: 3,
+            data: [85, 30, 34, 20, 20, 55, 45],
+        }, {
+            label: gettext('Stuffs'),
+            backgroundColor: 'rgba(255, 19, 157, 0.5)',
+            borderColor: 'rgb(255, 19, 157)',
+            hoverBorderWidth: 3,
+            data: [45, 75, 70, 80, 20, 30, 90],
+        }]
+    };
+
+    var traffic = document.getElementById('traffic');
+    var chart = new Chart(traffic, {
+        type: 'line',
+        data: data,
+        options: {
+            plugins: {
+                title: {
+                    display: true,
+                    text: gettext('Website Traffic'),
+                    padding: 15
+                }
+            }
+        }
+    });
+
+    // Setup
+    const labelsEnrollment = [
+        '2016',
+        '2017',
+        '2018',
+        '2019',
+        '2020',
+        '2021',
+    ];
+    const dataEnrollment = {
+        labels: labelsEnrollment,
+        datasets: [{
+            label: gettext('Comp.S'),
+            backgroundColor: 'rgba(86, 224, 224, 0.5)',
+            borderColor: 'rgb(86, 224, 224)',
+            hoverBorderWidth: 3,
+            data: [0, 10, 5, 2, 20, 30, 45]
+        }, {
+            label: gettext('Architecture'),
+            backgroundColor: 'rgba(253, 174, 28, 0.5)',
+            borderColor: 'rgb(253, 174, 28)',
+            hoverBorderWidth: 3,
+            data: [20, 0, 15, 4, 6, 4, 60],
+        }, {
+            label: gettext('Civil Eng'),
+            backgroundColor: 'rgba(203, 31, 255, 0.5)',
+            borderColor: 'rgb(203, 31, 255)',
+            hoverBorderWidth: 3,
+            data: [85, 30, 34, 20, 20, 55, 45],
+        }, {
+            label: gettext('Accounting'),
+            backgroundColor: 'rgba(255, 19, 157, 0.5)',
+            borderColor: 'rgb(255, 19, 157)',
+            hoverBorderWidth: 3,
+            data: [45, 75, 70, 80, 20, 30, 90],
+        }, {
+            label: gettext('Business M.'),
+            backgroundColor: 'rgba(0, 0, 0, 0.5)',
+            borderColor: 'rgb(0, 0, 0)',
+            hoverBorderWidth: 3,
+            data: [15, 75, 45, 90, 60, 30, 90],
+        }]
+    };
+
+    var enrollement = document.getElementById('enrollement');
+    var chart = new Chart(enrollement, {
+        type: 'bar',
+        data: dataEnrollment,
+        options: {
+            plugins: {
+                title: {
+                    display: true,
+                    text: gettext('Enrollment per course'),
+                    padding: 20
+                }
+            }
+        }
+    });
+
+    // Average grade setup
+    const labelsGrade = [
+        '2017',
+        '2018',
+        '2019',
+        '2020',
+        '2022',
+    ];
+    const dataGrade = {
+        labels: labelsGrade,
+        datasets: [{
+            label: gettext("Comp sci."),
+            backgroundColor: 'rgba(86, 224, 224, 0.5)',
+            borderColor: 'rgb(86, 224, 224)',
+            hoverBorderWidth: 3,
+            data: [0, 10, 5, 2, 20, 30, 45]
+        }, {
+            label: gettext("Civil eng."),
+            backgroundColor: 'rgba(253, 174, 28, 0.5)',
+            borderColor: 'rgb(253, 174, 28)',
+            hoverBorderWidth: 3,
+            data: [20, 0, 15, 4, 6, 4, 60],
+        }, {
+            label: gettext("Architect."),
+            backgroundColor: 'rgba(203, 31, 255, 0.5)',
+            borderColor: 'rgb(203, 31, 255)',
+            hoverBorderWidth: 3,
+            data: [85, 30, 34, 20, 20, 55, 45],
+        }, {
+            label: gettext("Economics"),
+            backgroundColor: 'rgba(255, 19, 157, 0.5)',
+            borderColor: 'rgb(255, 19, 157)',
+            hoverBorderWidth: 3,
+            data: [45, 75, 70, 80, 20, 30, 90],
+        }]
+    };
+    
+    var students_grade = document.getElementById('students_grade');
+    var chart = new Chart(students_grade, {
+        type: 'bar',
+        data: dataGrade,
+        options: {
+            plugins: {
+                title: {
+                    display: true,
+                    text: gettext('Students average grade (performance)'),
+                    padding: 20
+                }
+            }
+        }
+    });
+
+    const dataGender = {
+        labels: [
+            gettext('Man'),
+            gettext('Women')
+        ],
+        datasets: [{
+            label: gettext("Students Gender Dataset"),
+            data: [malesCount, femalesCount],
+            backgroundColor: [
+            'rgb(255, 99, 132)',
+            'rgb(54, 162, 235)'
+            ],
+            hoverOffset: 4
+        }]
+    };
+
+    var gender = document.getElementById('gender');
+    var chart = new Chart(gender, {
+        type: 'pie',
+        data: dataGender,
+        options: {
+            plugins: {
+                title: {
+                    display: true,
+                    text: gettext('Students Gender'),
+                    padding: 20
+                }
+            }
+        }
+    });
+
+    const dataQualification = {
+        labels: [
+            gettext('PHD'),
+            gettext('Masters'),
+            gettext('BSc degree')
+        ],
+        datasets: [{
+            label: gettext("Lecturer Qualifications Dataset"),
+            data: [24, 30, 26],
+            backgroundColor: [
+            'rgb(255, 99, 132)',
+            'rgb(255, 193, 7)',
+            'rgb(54, 162, 235)'
+            ],
+            hoverOffset: 4
+        }]
+    };
+    var ethnicity = document.getElementById('ethnicity');
+    var chart = new Chart(ethnicity, {
+        type: 'pie',
+        data: dataQualification,
+        options: {
+            plugins: {
+                title: {
+                    display: true,
+                    text: gettext('Lecturer qualifications'),
+                    padding: 20
+                }
+            }
+        }
+    });
+
+    const dataLevels = {
+        labels: [
+            gettext('PHD'),
+            gettext('Masters'),
+            gettext('BSc degree')
+        ],
+        datasets: [{
+            label: gettext("Students level"),
+            data: [14, 30, 56],
+            backgroundColor: [
+            'rgb(255, 99, 132)',
+            'rgb(255, 193, 7)',
+            'rgb(54, 162, 235)'
+            ],
+            hoverOffset: 4
+        }]
+    };
+    var language = document.getElementById('language');
+    var chart = new Chart(language, {
+        type: 'pie',
+        data: dataLevels,
+        options: {
+            plugins: {
+                title: {
+                    display: true,
+                    text: gettext('Student levels'),
+                    padding: 20
+                }
+            }
+        }
+    });
+})
+
+</script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/templates/course/program_single.html b/templates/course/program_single.html
index 0a32c6a..8b1eee1 100644
--- a/templates/course/program_single.html
+++ b/templates/course/program_single.html
@@ -15,8 +15,7 @@
 
 {% if request.user.is_superuser %}
 <div class="manage-wrap">
-    <a class="btn btn-sm btn-primary" href="{% url 'course_add' pk=program.pk %}"><i class="fas fa-plus"></i>{% trans 'Add
-        Course' %}</a>
+    <a class="btn btn-sm btn-primary" href="{% url 'course_add' pk=program.pk %}"><i class="fas fa-plus"></i>{% trans 'Add Course' %}</a>
 </div>
 {% endif %}