diff --git a/system/pages/admin/logs.php b/system/pages/admin/logs.php
index 1913edf0..f7c0e6d8 100644
--- a/system/pages/admin/logs.php
+++ b/system/pages/admin/logs.php
@@ -8,108 +8,74 @@
  * @link      https://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Logs viewer';
-?>
+$title = 'Logs Viewer';
 
-<div class="box">
-	<div class="box-header">
-		<h3 class="box-title">Logs:</h3>
-	</div>
-	<div class="box-body">
-		<div class="row">
-			<div class="col-sm-12">
-				<table id="tb_logs">
-					<thead>
-					<tr>
-						<th>Log name</th>
-						<th>Last updated</th>
-					</tr>
-					</thead>
-					<tbody>
-					<?php
-					$files = array();
-					$aac_path_logs = BASE . 'system/logs/';
-					foreach (scandir($aac_path_logs) as $f) {
-						if ($f[0] == '.' || $f == '..' || is_dir($aac_path_logs . $f))
-							continue;
+$files = array();
+$aac_path_logs = BASE . 'system/logs/';
+foreach (scandir($aac_path_logs, SCANDIR_SORT_ASCENDING) as $f) {
+    if ($f[0] === '.' || is_dir($aac_path_logs . $f)) {
+	    continue;
+    }
 
-						$files[] = array($f, $aac_path_logs);
-					}
+    $files[] = array($f, $aac_path_logs);
+}
 
-					$server_path_logs = $config['server_path'] . 'logs/';
-					if (!file_exists($server_path_logs)) {
-						$server_path_logs = $config['data_path'] . 'logs/';
-					}
+$server_path_logs = $config['server_path'] . 'logs/';
+if (!file_exists($server_path_logs)) {
+    $server_path_logs = $config['data_path'] . 'logs/';
+}
 
-					if (file_exists($server_path_logs)) {
-						foreach (scandir($server_path_logs) as $f) {
-							if ($f[0] == '.' || $f == '..')
-								continue;
+if (file_exists($server_path_logs)) {
+    foreach (scandir($server_path_logs, SCANDIR_SORT_ASCENDING) as $f) {
+        if ($f[0] === '.') {
+	        continue;
+        }
 
-							if (is_dir($server_path_logs . $f)) {
-								foreach (scandir($server_path_logs . $f) as $f2) {
-									if ($f2[0] == '.' || $f2 == '..')
-										continue;
-									$files[] = array($f . '/' . $f2, $server_path_logs);
-								}
+        if (is_dir($server_path_logs . $f)) {
+            foreach (scandir($server_path_logs . $f, SCANDIR_SORT_ASCENDING) as $f2) {
+                if ($f2[0] === '.') {
+	                continue;
+                }
 
-								continue;
-							}
+                $files[] = array($f . '/' . $f2, $server_path_logs);
+            }
 
-							$files[] = array($f, $server_path_logs);
-						}
-					}
+            continue;
+        }
 
-					$i = 0;
-					foreach ($files as $f) {
-						?>
-						<tr>
-							<td>
-								<a href="<?php echo ADMIN_URL . '?p=logs&file=' . $f[0]; ?>"><?php echo $f[0]; ?></a>
-							</td>
-							<td><?php echo date("Y-m-d H:i:s", filemtime($f[1] . $f[0])); ?></td>
-						</tr>
-						<?php
-					}
-					?>
-					</tbody>
-					<tfoot>
-					<th>Log name</th>
-					<th>Last updated</th>
-					</tfoot>
-				</table>
-			</div>
-		</div>
-	</div>
-</div>
+        $files[] = array($f, $server_path_logs);
+    }
+}
 
-<?php
+foreach ($files as &$f) {
+    $f['mtime'] = filemtime($f[1] . $f[0]);
+    $f['name'] = $f[0];
+}
+unset($f);
 
-$file = isset($_GET['file']) ? $_GET['file'] : NULL;
+$twig->display('admin.logs.html.twig', array('files' => $files));
+
+define('EXIST_NONE', 0);
+define('EXIST_SERVER_LOG', 1);
+define('EXIST_AAC_LOG', 2);
+
+$exist = EXIST_NONE;
+$file = isset($_GET['file']) ? $_GET['file'] : null;
 if (!empty($file)) {
 	if (!preg_match('/[^A-z0-9\' _\/\-\.]/', $file)) {
 		if (file_exists($aac_path_logs . $file)) {
-			echo '
-             <div class="box">
-                <div class="box-header">
-                    <h3 class="box-title"><b>' . $file . '</b></h3>
-                </div>
-                <div class="box-body">';
-			echo nl2br(file_get_contents($aac_path_logs . $file));
-			echo '</div>
-             </div>';
+			$exist = EXIST_AAC_LOG;
 		} else if (file_exists($server_path_logs . $file)) {
-			echo '<div class="box"><div class="box-header"><h3 class="box-title"><b>' . $file . '</b></h3></div><div class="box-body">';
-			echo nl2br(file_get_contents($server_path_logs . $file));
-			echo '</div></div>';
-		} else
+			$exist = EXIST_SERVER_LOG;
+		} else {
 			echo 'Specified file does not exist.';
-	} else
+		}
+
+		if ($exist !== EXIST_NONE) {
+			$content = nl2br(file_get_contents(($exist === EXIST_SERVER_LOG ? $server_path_logs : $aac_path_logs) . $file));
+			$twig->display('admin.logs.view.html.twig', array('file' => $file, 'content' => $content));
+		}
+	} else {
 		echo 'Invalid file name specified.';
-}
-?>
-<script>
-	$(function () {
-		$('#tb_logs').DataTable()
-	})
-</script>
\ No newline at end of file
+	}
+}
\ No newline at end of file
diff --git a/system/pages/admin/reports.php b/system/pages/admin/reports.php
index 46daf543..821656b2 100644
--- a/system/pages/admin/reports.php
+++ b/system/pages/admin/reports.php
@@ -8,84 +8,54 @@
  * @link      https://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
-$title = 'Report viewer';
-?>
+$title = 'Report Viewer';
 
-<div class="box">
-	<div class="box-header">
-		<h3 class="box-title">Reports:</h3>
-	</div>
-	<div class="box-body">
-		<div class="row">
-			<div class="col-sm-12">
-				<table id="tb_reports">
-					<thead>
-					<tr>
-						<th>Report name</th>
-						<th>Last updated</th>
-					</tr>
-					</thead>
-					<tbody>
-					<?php
-					$files = array();
-					$server_path_reports = $config['data_path'] . 'reports/';
+$files = array();
+$server_path_reports = $config['data_path'] . 'reports/';
 
-					if (file_exists($server_path_reports)) {
-						foreach (scandir($server_path_reports) as $f) {
-							if ($f[0] == '.' || $f == '..')
-								continue;
+if (file_exists($server_path_reports)) {
+    foreach (scandir($server_path_reports, SCANDIR_SORT_ASCENDING) as $f) {
+        if ($f[0] === '.') {
+	        continue;
+        }
 
-							if (is_dir($server_path_reports . $f)) {
-								foreach (scandir($server_path_reports . $f) as $f2) {
-									if ($f2[0] == '.' || $f2 == '..')
-										continue;
-									$files[] = array($f . '/' . $f2, $server_path_reports);
-								}
+        if (is_dir($server_path_reports . $f)) {
+            foreach (scandir($server_path_reports . $f, SCANDIR_SORT_ASCENDING) as $f2) {
+                if ($f2[0] === '.') {
+	                continue;
+                }
 
-								continue;
-							}
+                $files[] = array($f . '/' . $f2, $server_path_reports);
+            }
 
-							$files[] = array($f, $server_path_reports);
-						}
-					}
+            continue;
+        }
 
-					$i = 0;
-					foreach ($files as $f) {
-						?>
-						<tr>
-							<td>
-								<a href="<?php echo ADMIN_URL . '?p=reports&file=' . $f[0]; ?>"><?php echo $f[0]; ?></a>
-							</td>
-							<td><?php echo date("Y-m-d H:i:s", filemtime($f[1] . $f[0])); ?></td>
-						</tr>
-						<?php
-					}
-					?>
-					</tbody>
-				</table>
-			</div>
-		</div>
-	</div>
-</div>
+        $files[] = array($f, $server_path_reports);
+    }
+}
+
+foreach ($files as &$f) {
+	$f['mtime'] = filemtime($f[1] . $f[0]);
+	$f['name'] = $f[0];
+}
+
+unset($f);
+
+$twig->display('admin.reports.html.twig', array('files' => $files));
 
-<?php
 
 $file = isset($_GET['file']) ? $_GET['file'] : NULL;
 if (!empty($file)) {
 	if (!preg_match('/[^A-z0-9\' _\/\-\.]/', $file)) {
 		if (file_exists($server_path_reports . $file)) {
-			echo '<div class="box"><div class="box-header"><h3 class="box-title"><b>' . $file . '</b></h3></div><div class="box-body">';
-			echo nl2br(file_get_contents($server_path_reports . $file));
-			echo '</div></div>';
-		} else
-			echo 'Specified file does not exist.';
-	} else
-		echo 'Invalid file name specified.';
-}
-?>
-<script>
-	$(document).ready(function () {
-		$('#tb_reports').DataTable();
+			$content = nl2br(file_get_contents($server_path_reports . $file));
 
-	});
-</script>
\ No newline at end of file
+			$twig->display('admin.logs.view.html.twig', array('file' => $file, 'content' => $content));
+		} else {
+			echo 'Specified file does not exist.';
+		}
+	} else {
+		echo 'Invalid file name specified.';
+	}
+}
\ No newline at end of file
diff --git a/system/templates/admin.logs.html.twig b/system/templates/admin.logs.html.twig
new file mode 100644
index 00000000..9c47bf6a
--- /dev/null
+++ b/system/templates/admin.logs.html.twig
@@ -0,0 +1,41 @@
+<div class="box">
+	<div class="box-header">
+		<h3 class="box-title">Logs:</h3>
+	</div>
+	<div class="box-body">
+		<div class="row">
+			<div class="col-sm-12">
+				<table id="tb_logs">
+					<thead>
+						<tr>
+							<th>Log name</th>
+							<th>Last updated</th>
+						</tr>
+					</thead>
+					<tbody>
+					{% for file in files %}
+						<tr>
+							<td>
+								<a href="{{ constant('ADMIN_URL') }}?p=logs&file={{ file.name }}">{{ file.name }}</a>
+							</td>
+							<td>{{ file.mtime|date('Y-m-d H:i:s') }}</td>
+						</tr>
+					{% endfor %}
+					</tbody>
+					<tfoot>
+						<tr>
+							<th>Log name</th>
+							<th>Last updated</th>
+						</tr>
+					</tfoot>
+				</table>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function () {
+		$('#tb_logs').DataTable()
+	})
+</script>
\ No newline at end of file
diff --git a/system/templates/admin.logs.view.html.twig b/system/templates/admin.logs.view.html.twig
new file mode 100644
index 00000000..ae7ab9e2
--- /dev/null
+++ b/system/templates/admin.logs.view.html.twig
@@ -0,0 +1,8 @@
+<div class="box">
+	<div class="box-header">
+		<h3 class="box-title"><b>{{ file }}</b></h3>
+	</div>
+	<div class="box-body">
+        {{ content|raw }}
+    </div>
+</div>
\ No newline at end of file
diff --git a/system/templates/admin.reports.html.twig b/system/templates/admin.reports.html.twig
new file mode 100644
index 00000000..bec8281e
--- /dev/null
+++ b/system/templates/admin.reports.html.twig
@@ -0,0 +1,41 @@
+<div class="box">
+    <div class="box-header">
+        <h3 class="box-title">Reports:</h3>
+    </div>
+    <div class="box-body">
+        <div class="row">
+            <div class="col-sm-12">
+                <table id="tb_reports">
+                    <thead>
+                        <tr>
+                            <th>Report name</th>
+                            <th>Last updated</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                    {% for file in files %}
+                        <tr>
+                            <td>
+                                <a href="{{ constant('ADMIN_URL') }}?p=reports&file={{ file.name }}">{{ file.name }}</a>
+                            </td>
+                            <td>{{ file.mtime|date('Y-m-d H:i:s') }}</td>
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                    <tfoot>
+                    <tr>
+                        <th>Report name</th>
+                        <th>Last updated</th>
+                    </tr>
+                    </tfoot>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    $(document).ready(function () {
+        $('#tb_reports').DataTable();
+
+    });
+</script>
\ No newline at end of file