diff --git a/app/zonefileviewer.cpp b/app/zonefileviewer.cpp
index 6e25c04..52d736e 100644
--- a/app/zonefileviewer.cpp
+++ b/app/zonefileviewer.cpp
@@ -1,6 +1,8 @@
 #include "zonefileviewer.h"
 #include "ui_zonefileviewer.h"
 
+#include "statusbarmanager.h"
+
 ZoneFileViewer::ZoneFileViewer(QWidget *parent)
     : QWidget(parent)
     , ui(new Ui::ZoneFileViewer) {
@@ -8,16 +10,19 @@ ZoneFileViewer::ZoneFileViewer(QWidget *parent)
 
     mZoneFile = nullptr;
 
-    ui->tableWidget_RecordCounts->setColumnCount(4);
-    ui->tableWidget_RecordCounts->setHorizontalHeaderLabels({ "Identifier", "Asset", "Count", "Icon" });
+    ui->tableWidget_RecordCounts->setColumnCount(3);
+    ui->tableWidget_RecordCounts->setHorizontalHeaderLabels({ "Identifier", "Asset", "Count" });
     ui->tableWidget_RecordCounts->horizontalHeader()->setStretchLastSection(true);
 
-    ui->tableWidget_RecordOrder->setColumnCount(4);
-    ui->tableWidget_RecordOrder->setHorizontalHeaderLabels({ "Identifier", "Asset", "Count", "Icon" });
+    ui->tableWidget_RecordOrder->setColumnCount(3);
+    ui->tableWidget_RecordOrder->setHorizontalHeaderLabels({ "Identifier", "Asset", "Count" });
     ui->tableWidget_RecordOrder->horizontalHeader()->setStretchLastSection(true);
 
     connect(ui->lineEdit_TagSearch, &QLineEdit::textChanged, this, &ZoneFileViewer::SortTags);
     connect(ui->tableWidget_RecordCounts, &QTableWidget::itemSelectionChanged, this, &ZoneFileViewer::HighlightRecordInOrder);
+    connect(ui->listWidget_Tags, &QListWidget::currentTextChanged, this, [this](const QString &aCurrentText) {
+        StatusBarManager::instance().updateStatus(QString("Selected tag '%1' with index %2").arg(aCurrentText).arg(mZoneFile->GetTags().indexOf(aCurrentText)));
+    });
 }
 
 ZoneFileViewer::~ZoneFileViewer() {
@@ -60,6 +65,7 @@ void ZoneFileViewer::SortTags(const QString &aSearchText) {
         }
     }
 
+    StatusBarManager::instance().updateStatus(QString("Found %1 tags.").arg(sortedTags.size()));
     ui->listWidget_Tags->addItems(sortedTags);
 }
 
@@ -72,7 +78,9 @@ void ZoneFileViewer::SetZoneFile(std::shared_ptr<ZoneFile> aZoneFile) {
 
     const QStringList tags = mZoneFile->GetTags();
     ui->listWidget_Tags->addItems(tags);
-    ui->label_Title->setText(mZoneFile->GetStem() + ".zone");
+    ui->label_Title->setText(mZoneFile->GetBaseStem() + ".zone");
+
+    ui->groupBox_Tags->setTitle(QString("Tags (%1)").arg(tags.size()));
 
     if (tags.isEmpty()) {
         ui->groupBox_Tags->hide();
@@ -112,13 +120,11 @@ void ZoneFileViewer::SetZoneFile(std::shared_ptr<ZoneFile> aZoneFile) {
         QTableWidgetItem *recordItem = new QTableWidgetItem(record.toUpper());
         QTableWidgetItem *recordStrItem = new QTableWidgetItem(mZoneFile->AssetEnumToStr(assetType));
         QTableWidgetItem *recordCountItem = new QTableWidgetItem(QString::number(assetCount));
-        QTableWidgetItem *recordIconItem = new QTableWidgetItem();
-        recordIconItem->setIcon(assetIcon);
+        recordItem->setIcon(assetIcon);
 
         ui->tableWidget_RecordOrder->setItem(assetIndex, 0, recordItem);
         ui->tableWidget_RecordOrder->setItem(assetIndex, 1, recordStrItem);
         ui->tableWidget_RecordOrder->setItem(assetIndex, 2, recordCountItem);
-        ui->tableWidget_RecordOrder->setItem(assetIndex, 3, recordIconItem);
 
         assetIndex++;
     }
@@ -135,16 +141,14 @@ void ZoneFileViewer::SetZoneFile(std::shared_ptr<ZoneFile> aZoneFile) {
 
         ui->tableWidget_RecordCounts->setRowCount(recordIndex + 1);
 
-        QTableWidgetItem *recordCountStrItem = new QTableWidgetItem(mZoneFile->AssetEnumToStr(assetType));
         QTableWidgetItem *recordItem = new QTableWidgetItem(record.toUpper());
+        QTableWidgetItem *recordCountStrItem = new QTableWidgetItem(mZoneFile->AssetEnumToStr(assetType));
         QTableWidgetItem *recordCountItem = new QTableWidgetItem(QString::number(recordCount));
-        QTableWidgetItem *recordIconItem = new QTableWidgetItem();
-        recordIconItem->setIcon(assetIcon);
+        recordItem->setIcon(assetIcon);
 
         ui->tableWidget_RecordCounts->setItem(recordIndex, 0, recordItem);
         ui->tableWidget_RecordCounts->setItem(recordIndex, 1, recordCountStrItem);
         ui->tableWidget_RecordCounts->setItem(recordIndex, 2, recordCountItem);
-        ui->tableWidget_RecordCounts->setItem(recordIndex, 3, recordIconItem);
 
         recordIndex++;
     }