diff --git a/system/pages/admin/news.php b/system/pages/admin/news.php
index 152ad99f..1a871ed5 100644
--- a/system/pages/admin/news.php
+++ b/system/pages/admin/news.php
@@ -131,49 +131,24 @@ if($action == 'edit' || $action == 'new') {
 }
 
 $query = $db->query('SELECT * FROM ' . $db->tableName(TABLE_PREFIX . 'news'));
-$newses = $tickers = $articles = array();
+$newses = array();
 foreach ($query as $_news) {
 	$_player = new OTS_Player();
-	$_player->load($_news['player_id']);	
+	$_player->load($_news['player_id']);
 
-	if($_news['type'] == constant('NEWS')){
-		$newses[] = array(
-			'id' => $_news['id'],
-			'hidden' => $_news['hidden'],
-			'archive_link' => getLink('news') . '/archive/' . $_news['id'],
-			'title' => $_news['title'],
-			'date' => $_news['date'],
-			'player_name' => isset($_player) && $_player->isLoaded() ? $_player->getName() : '',
-			'player_link' => isset($_player) && $_player->isLoaded() ? getPlayerLink($_player->getName(), false) : '',
-		);		
-	} else if ($_news['type'] == constant('TICKER')) {
-
-		$tickers[] = array(
-			'id' => $_news['id'],
-			'hidden' => $_news['hidden'],
-			'archive_link' => getLink('news') . '/archive/' . $_news['id'],
-			'title' => $_news['title'],
-			'date' => $_news['date'],
-			'player_name' => isset($_player) && $_player->isLoaded() ? $_player->getName() : '',
-			'player_link' => isset($_player) && $_player->isLoaded() ? getPlayerLink($_player->getName(), false) : '',
-		);	
-	} else if ($_news['type'] == constant('ARTICLE')) {
-		$articles[] = array(
-			'id' => $_news['id'],
-			'hidden' => $_news['hidden'],
-			'archive_link' => getLink('news') . '/archive/' . $_news['id'],
-			'title' => $_news['title'],
-			'date' => $_news['date'],
-			'player_name' => isset($_player) && $_player->isLoaded() ? $_player->getName() : '',
-			'player_link' => isset($_player) && $_player->isLoaded() ? getPlayerLink($_player->getName(), false) : '',
-		);
-	}
+	$newses[$_news['type']][] = array(
+		'id' => $_news['id'],
+		'hidden' => $_news['hidden'],
+		'archive_link' => getLink('news') . '/archive/' . $_news['id'],
+		'title' => $_news['title'],
+		'date' => $_news['date'],
+		'player_name' => isset($_player) && $_player->isLoaded() ? $_player->getName() : '',
+		'player_link' => isset($_player) && $_player->isLoaded() ? getPlayerLink($_player->getName(), false) : '',
+	);
 }
 
 $twig->display('admin.news.html.twig', array(
-	'newses' => $newses,
-	'tickers' => $tickers,
-	'articles' => $articles	
+	'newses' => $newses
 ));
 
 class News
@@ -224,7 +199,7 @@ class News
 		if(!self::verify($title, $body, $article_text, $article_image, $errors))
 			return false;
 
-		$db->update(TABLE_PREFIX . 'news', array('title' => $title, 'body' => $body, 'type' => $type, 'category' => $category, 'last_modified_by' => isset($player_id) ? $player_id : 0, 'last_modified_date' => time(), 'comments' => $comments, 'article_text' => $article_text, 'article_image' => $article_image), array('id' => $id));		
+		$db->update(TABLE_PREFIX . 'news', array('title' => $title, 'body' => $body, 'type' => $type, 'category' => $category, 'last_modified_by' => isset($player_id) ? $player_id : 0, 'last_modified_date' => time(), 'comments' => $comments, 'article_text' => $article_text, 'article_image' => $article_image), array('id' => $id));
 		return true;
 	}
 
diff --git a/system/templates/admin.news.html.twig b/system/templates/admin.news.html.twig
index 49ad1f7b..4320f120 100644
--- a/system/templates/admin.news.html.twig
+++ b/system/templates/admin.news.html.twig
@@ -3,7 +3,7 @@
 		<h3 class="box-title">News:</h3>
 		<div class="box-tools pull-right">
 			<a href="?p=news&action=new&type=1"><span class="btn btn-success">New</span></a>
-		</div>		
+		</div>
 	</div>
 	<div class="box-body">
 		<div class="row">
@@ -19,7 +19,7 @@
 					</tr>
 					</thead>
 					<tbody>
-					{% for news in newses %}
+					{% for news in newses[constant('NEWS')] %}
 						<tr>
 							<td>{{ news.id|raw }}</td>
 							<td><i><a href="?p=news&action=edit&id={{ news.id }}">{{ news.title }}</a></i></td>
@@ -80,7 +80,7 @@
 					</tr>
 					</thead>
 					<tbody>
-					{% for ticker in tickers %}
+					{% for ticker in newses[constant('TICKER')] %}
 						<tr>
 							<td>{{ ticker.id|raw }}</td>
 							<td><i><a href="?p=news&action=edit&id={{ ticker.id }}">{{ ticker.title }}</a></i></td>
@@ -141,7 +141,7 @@
 					</tr>
 					</thead>
 					<tbody>
-					{% for article in articles %}
+					{% for article in newses[constant('ARTICLE')] %}
 						<tr>
 							<td>{{ article.id|raw }}</td>
 							<td><i><a href="?p=news&action=edit&id={{ article.id }}">{{ article.title }}</a></i></td>
@@ -183,6 +183,6 @@
 	$(function () {
 	    $('.tb_datatable').DataTable({
 	        "order": [[ 0, "desc" ]]
-	    });		
-	});	
+	    });
+	});
 </script>
\ No newline at end of file