diff --git a/main/admin/teacher_time_report_by_session.php b/main/admin/teachers_time_by_session_report.php
similarity index 98%
rename from main/admin/teacher_time_report_by_session.php
rename to main/admin/teachers_time_by_session_report.php
index b426753cd6..1a863429d6 100644
--- a/main/admin/teacher_time_report_by_session.php
+++ b/main/admin/teachers_time_by_session_report.php
@@ -170,7 +170,7 @@ if ($session) {
     $view->assign('data', $data);
 }
 
-$template = $view->get_template('admin/teacher_time_report_by_session.tpl');
+$template = $view->get_template('admin/teachers_time_by_session_report.tpl');
 $content = $view->fetch($template);
 
 $view->assign('header', $toolName);
diff --git a/main/template/default/admin/teacher_time_report.tpl b/main/template/default/admin/teacher_time_report.tpl
index 6c5dda04b9..0acb0154ff 100644
--- a/main/template/default/admin/teacher_time_report.tpl
+++ b/main/template/default/admin/teacher_time_report.tpl
@@ -28,18 +28,16 @@
     </script>
     <div class="col-md-12">
         <div class="actions">
-            <div class="row">
-                <div class="col-md-12">
-                    <a href="{{ _p.web_self ~ '?' ~ {'export':'pdf','from':selectedFrom,'until':selectedUntil,'course':selectedCourse,'session':selectedSession,'teacher':selectedTeacher}|url_encode }}">
-                        {{ 'pdf.png' | img(32, 'ExportToPDF'|get_lang ) }}
-                    </a>
-                    <a href="{{ _p.web_self ~ '?' ~ {'export':'xls','from':selectedFrom,'until':selectedUntil,'course':selectedCourse,'session':selectedSession,'teacher':selectedTeacher}|url_encode }}">
-                         {{ 'export_excel.png' | img(32, 'ExportExcel'|get_lang ) }}
-                    </a>
-                    <a href="{{ _p.web_main }}admin/teacher_time_report_by_session.php">
-                        {{ 'session.png'|img(32, 'Sessions'|get_lang) }}
-                    </a>
-                </div>
+            <a href="{{ _p.web_main }}admin/teachers_time_by_session_report.php">
+                {{ 'session.png'|img(32, 'Sessions'|get_lang) }}
+            </a>
+            <div class="pull-right">
+                <a href="{{ _p.web_self ~ '?' ~ {'export':'pdf','from':selectedFrom,'until':selectedUntil,'course':selectedCourse,'session':selectedSession,'teacher':selectedTeacher}|url_encode }}">
+                    {{ 'pdf.png' | img(32, 'ExportToPDF'|get_lang ) }}
+                </a>
+                <a href="{{ _p.web_self ~ '?' ~ {'export':'xls','from':selectedFrom,'until':selectedUntil,'course':selectedCourse,'session':selectedSession,'teacher':selectedTeacher}|url_encode }}">
+                    {{ 'export_excel.png' | img(32, 'ExportExcel'|get_lang ) }}
+                </a>
             </div>
         </div>
         <h1 class="page-header">{{ 'TeacherTimeReport' | get_lang }}</h1>
diff --git a/main/template/default/admin/teacher_time_report_by_session.tpl b/main/template/default/admin/teachers_time_by_session_report.tpl
similarity index 100%
rename from main/template/default/admin/teacher_time_report_by_session.tpl
rename to main/template/default/admin/teachers_time_by_session_report.tpl