diff --git a/sai/modules/saimod_sys_log/saimod_sys_log.php b/sai/modules/saimod_sys_log/saimod_sys_log.php
index ec2e7e3..290dca0 100644
--- a/sai/modules/saimod_sys_log/saimod_sys_log.php
+++ b/sai/modules/saimod_sys_log/saimod_sys_log.php
@@ -306,11 +306,10 @@ class saimod_sys_log extends \SYSTEM\SAI\SaiModule {
         }
         $vars = \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_LOG);
         $vars['count'] = $count['count'];
+        $vars['error_filter'] = self::generate_error_filters($filter_);
+        $vars['active'] = ($filter == '%' ? 'active' : '');
         $vars['table'] = $table;
-        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl'),
-                array(  'table' => \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_table.tpl'), $vars),
-                        'error_filter' => self::generate_error_filters($filter_),
-                        'active' => $filter == '%' ? 'active' : ''));
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl'),$vars);
     }
     
     private static function time_elapsed_string($ptime){
diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_error.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_error.tpl
index c000c34..fe38888 100644
--- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_error.tpl
+++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_error.tpl
@@ -1,23 +1,23 @@
-<h3>Error ${ID}</h3>
+<h3>${basic_error} ${ID}</h3>
 <table class="table table-hover table-condensed">
-    <tr><th>Property</th><th>Value</th></tr>
-    <tr><td>ID</td><td>${ID}</td></tr>
-    <tr><td>class</td><td>${class}</td></tr>    
-    <tr><td>code</td><td>${code}</td></tr>
-    <tr><td>file</td><td>${file}</td></tr>
-    <tr><td>line</td><td>${line}</td></tr>
-    <tr><td>trace</td><td>${trace}</td></tr>
-    <tr><td>ip</td><td>${ip}</td></tr>
-    <tr><td>querytime</td><td>${querytime}</td></tr>
-    <tr><td>time</td><td>${time}</td></tr>
-    <tr><td>server_name</td><td>${server_name}</td></tr>
-    <tr><td>server_port</td><td>${server_port}</td></tr>
-    <tr><td>request_uri</td><td>${request_uri}</td></tr>
-    <tr><td>url</td><td><a href="${server_name}:${server_port}${request_uri}">${server_name}:${server_port}${request_uri}</a></td></tr>
-    <tr><td>post</td><td>${post}</td></tr>
-    <tr><td>http_referer</td><td>${http_referer}</td></tr>
-    <tr><td>http_user_agent</td><td>${http_user_agent}</td></tr>
-    <tr><td>user</td><td>${username}</td></tr>
-    <tr><td>thrown</td><td>${thrown}</td></tr>    
-    <tr><td>message</td><td>${message}</td></tr>
+    <tr><th>${table_property}</th><th>${table_value}</th></tr>
+    <tr><td>${table_id}</td><td>${ID}</td></tr>
+    <tr><td>${table_class}</td><td>${class}</td></tr>    
+    <tr><td>${table_code}</td><td>${code}</td></tr>
+    <tr><td>${table_file}</td><td>${file}</td></tr>
+    <tr><td>${table_line}</td><td>${line}</td></tr>
+    <tr><td>${table_trace}</td><td>${trace}</td></tr>
+    <tr><td>${table_ip}</td><td>${ip}</td></tr>
+    <tr><td>${table_querytime}</td><td>${querytime}</td></tr>
+    <tr><td>${table_time}</td><td>${time}</td></tr>
+    <tr><td>${table_server_name}</td><td>${server_name}</td></tr>
+    <tr><td>${table_server_port}</td><td>${server_port}</td></tr>
+    <tr><td>${table_request_uri}</td><td>${request_uri}</td></tr>
+    <tr><td>${table_url}</td><td><a href="${server_name}:${server_port}${request_uri}">${server_name}:${server_port}${request_uri}</a></td></tr>
+    <tr><td>${table_post}</td><td>${post}</td></tr>
+    <tr><td>${table_http_referer}</td><td>${http_referer}</td></tr>
+    <tr><td>${table_http_user_agent}</td><td>${http_user_agent}</td></tr>
+    <tr><td>${table_user}</td><td>${username}</td></tr>
+    <tr><td>${table_thrown}</td><td>${thrown}</td></tr>    
+    <tr><td>${table_message}</td><td>${message}</td></tr>
 </table>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl
index 205f080..c2654d0 100644
--- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl
+++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_filter.tpl
@@ -1,5 +1,21 @@
 <ul class="nav nav-pills" id="error_filter">    
-    <li class="${active}"><a href="#!log" filter="%">All</a></li>
+    <li class="${active}"><a href="#!log" filter="%">${basic_all}</a></li>
     ${error_filter}
 </ul>
-<div id="table_log">${table}</div>
\ No newline at end of file
+<div id="table_log">
+    ${basic_rows}: ${count}
+    <table class="table table-hover table-condensed">                    
+        <tr>
+            <th>${time_ago}</th>
+            <th>${table_class}</th>
+            <th>${table_message}</th>
+            <th>${table_file}</th>
+            <th>${table_line}</th>
+            <th>${table_ip}</th>
+            <th>${table_url}</th>
+            <th>${table_user}</th>
+            <th>${table_querytime}</th>
+        </tr>
+        ${table}
+    </table>
+</div>
\ No newline at end of file
diff --git a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_table.tpl b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_table.tpl
index 5c7a35e..e69de29 100644
--- a/sai/modules/saimod_sys_log/tpl/saimod_sys_log_table.tpl
+++ b/sai/modules/saimod_sys_log/tpl/saimod_sys_log_table.tpl
@@ -1,15 +0,0 @@
-Rows: ${count}
-<table class="table table-hover table-condensed">                    
-    <tr>
-        <th>time ago</th>
-        <th>class</th>
-        <th>message</th>
-        <th>file</th>
-        <th>line</th>
-        <th>ip</th>
-        <th>url</th>
-        <th>user</th>
-        <th>querytime</th>
-    </tr>
-    ${table}
-</table>
\ No newline at end of file