diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index ffa87f035..eb8220fa9 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -375,13 +375,15 @@ class ConfigController extends BaseConfigController
         $this->render('authentication/remove');
     }
 
-    public function resourceAction($showOnly = false)
+    /**
+     * Display all available resources and a link to create a new one
+     */
+    public function resourceAction()
     {
+        $this->view->messageBox = new AlertMessageBox(true);
         $this->view->tabs->activate('resources');
 
-        $this->view->messageBox = new AlertMessageBox(true);
         $this->view->resources = IcingaConfig::app('resources', true)->toArray();
-        $this->render('resource');
     }
 
     public function createresourceAction()
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 2e0d95234..8e2c2eedd 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -1,30 +1,33 @@
 <div class="controls">
-<?= $this->tabs ?>
+  <?= $tabs; ?>
 </div>
-
 <div class="content" data-base-target="_next">
-<?php
-
-if (isset($this->messageBox)) {
-    // TODO: Get rid of messageBoxes in favour of notifications
-    echo $this->messageBox->render();
-}
-
-?>
-<p><a href="<?= $this->href('/config/createresource') ?>"><?= $this->icon('create.png'); ?> Create A New Resource</a></p>
-
-<table class="action">
- <thead>
-  <th>Resource</th>
-  <th style="width: 5em">Remove</th>
- </thead>
- <tbody>
+  <?= $messageBox; ?>
+  <p>
+    <a href="<?= $this->href('/config/createresource') ?>">
+      <?= $this->icon('create.png'); ?> <?= $this->translate('Create a new resource'); ?>
+    </a>
+  </p>
+  <table class="action">
+    <thead>
+      <th><?= $this->translate('Resource'); ?></th>
+      <th style="width: 5em"><?= $this->translate('Remove'); ?></th>
+    </thead>
+    <tbody>
 <?php foreach ($this->resources as $name => $resource): ?>
-  <tr>
-    <td><a href="<?= $this->href('config/editresource', array('resource' => $name)) ?>"><?= $this->icon('edit.png') ?> <?= $this->escape($name); ?></td>
-    <td style="text-align: center"><a href="<?= $this->href('config/removeresource', array('resource' => $name)) ?>"><?= $this->icon('remove.png'); ?></a></td>
-  </tr>
+      <tr>
+        <td>
+          <a href="<?= $this->href('config/editresource', array('resource' => $name)) ?>">
+            <?= $this->icon('edit.png') ?> <?= $this->escape($name); ?>
+          </a>
+        </td>
+        <td style="text-align: center">
+          <a href="<?= $this->href('config/removeresource', array('resource' => $name)) ?>">
+            <?= $this->icon('remove.png'); ?>
+          </a>
+        </td>
+      </tr>
 <?php endforeach; ?>
-</table>
-</div>
-
+    </tbody>
+  </table>
+</div>
\ No newline at end of file