diff --git a/scwx-qt/source/scwx/qt/model/layer_model.cpp b/scwx-qt/source/scwx/qt/model/layer_model.cpp
index 36847512..3a95f15c 100644
--- a/scwx-qt/source/scwx/qt/model/layer_model.cpp
+++ b/scwx-qt/source/scwx/qt/model/layer_model.cpp
@@ -10,6 +10,7 @@
 #include <QFontMetrics>
 #include <QStyle>
 #include <QStyleOption>
+#include <boost/container/devector.hpp>
 
 namespace scwx
 {
@@ -32,21 +33,37 @@ static const std::unordered_map<LayerModel::LayerType, std::string>
                     {LayerModel::LayerType::Alert, "Alert"},
                     {LayerModel::LayerType::Placefile, "Placefile"}};
 
-class LayerModelImpl
+typedef std::variant<std::monostate, std::string, awips::Phenomenon>
+   LayerDescription;
+typedef boost::container::devector<
+   std::pair<LayerModel::LayerType, LayerDescription>>
+   LayerVector;
+
+class LayerModel::Impl
 {
 public:
-   explicit LayerModelImpl() {}
-   ~LayerModelImpl() = default;
+   explicit Impl()
+   {
+      layers_.emplace_back(LayerType::Alert, awips::Phenomenon::Tornado);
+      layers_.emplace_back(LayerType::Alert, awips::Phenomenon::SnowSquall);
+      layers_.emplace_back(LayerType::Alert,
+                           awips::Phenomenon::SevereThunderstorm);
+      layers_.emplace_back(LayerType::Alert, awips::Phenomenon::FlashFlood);
+      layers_.emplace_back(LayerType::Alert, awips::Phenomenon::Marine);
+      layers_.emplace_back(LayerType::Map, "Map Overlay");
+      layers_.emplace_back(LayerType::Radar, std::monostate {});
+      layers_.emplace_back(LayerType::Map, "Map Underlay");
+   }
+   ~Impl() = default;
 
    std::shared_ptr<manager::PlacefileManager> placefileManager_ {
       manager::PlacefileManager::Instance()};
 
-   std::vector<std::pair<LayerModel::LayerType, std::variant<std::string>>>
-      layers_ {};
+   LayerVector layers_ {};
 };
 
 LayerModel::LayerModel(QObject* parent) :
-    QAbstractTableModel(parent), p(std::make_unique<LayerModelImpl>())
+    QAbstractTableModel(parent), p(std::make_unique<Impl>())
 {
    connect(p->placefileManager_.get(),
            &manager::PlacefileManager::PlacefileEnabled,
@@ -86,10 +103,10 @@ Qt::ItemFlags LayerModel::flags(const QModelIndex& index) const
 
    switch (index.column())
    {
-   case static_cast<int>(Column::EnabledMap1):
-   case static_cast<int>(Column::EnabledMap2):
-   case static_cast<int>(Column::EnabledMap3):
-   case static_cast<int>(Column::EnabledMap4):
+   case static_cast<int>(Column::DisplayMap1):
+   case static_cast<int>(Column::DisplayMap2):
+   case static_cast<int>(Column::DisplayMap3):
+   case static_cast<int>(Column::DisplayMap4):
       flags |= Qt::ItemFlag::ItemIsUserCheckable | Qt::ItemFlag::ItemIsEditable;
       break;
 
@@ -105,6 +122,9 @@ QVariant LayerModel::data(const QModelIndex& index, int role) const
    static const QString enabledString  = QObject::tr("Enabled");
    static const QString disabledString = QObject::tr("Disabled");
 
+   static const QString displayedString = QObject::tr("Displayed");
+   static const QString hiddenString    = QObject::tr("Hidden");
+
    if (!index.isValid() || index.row() < 0 ||
        static_cast<std::size_t>(index.row()) >= p->layers_.size())
    {
@@ -119,18 +139,18 @@ QVariant LayerModel::data(const QModelIndex& index, int role) const
    case static_cast<int>(Column::Order):
       if (role == Qt::ItemDataRole::DisplayRole)
       {
-         return index.row();
+         return index.row() + 1;
       }
       break;
 
-   case static_cast<int>(Column::EnabledMap1):
-   case static_cast<int>(Column::EnabledMap2):
-   case static_cast<int>(Column::EnabledMap3):
-   case static_cast<int>(Column::EnabledMap4):
+   case static_cast<int>(Column::DisplayMap1):
+   case static_cast<int>(Column::DisplayMap2):
+   case static_cast<int>(Column::DisplayMap3):
+   case static_cast<int>(Column::DisplayMap4):
       // TODO
       if (role == Qt::ItemDataRole::ToolTipRole)
       {
-         return enabled ? enabledString : disabledString;
+         return enabled ? displayedString : hiddenString;
       }
       else if (role == Qt::ItemDataRole::CheckStateRole)
       {
@@ -147,6 +167,24 @@ QVariant LayerModel::data(const QModelIndex& index, int role) const
       }
       break;
 
+   case static_cast<int>(Column::Enabled):
+      if (role == Qt::ItemDataRole::DisplayRole ||
+          role == Qt::ItemDataRole::ToolTipRole)
+      {
+         if (layer.first == LayerType::Placefile)
+         {
+            return p->placefileManager_->placefile_enabled(
+                      std::get<std::string>(layer.second)) ?
+                      enabledString :
+                      disabledString;
+         }
+         else
+         {
+            return enabledString;
+         }
+      }
+      break;
+
    case static_cast<int>(Column::Description):
       if (role == Qt::ItemDataRole::DisplayRole ||
           role == Qt::ItemDataRole::ToolTipRole)
@@ -171,6 +209,11 @@ QVariant LayerModel::data(const QModelIndex& index, int role) const
                return QString::fromStdString(
                   std::get<std::string>(layer.second));
             }
+            else if (std::holds_alternative<awips::Phenomenon>(layer.second))
+            {
+               return QString::fromStdString(awips::GetPhenomenonText(
+                  std::get<awips::Phenomenon>(layer.second)));
+            }
          }
       }
       break;
@@ -191,21 +234,24 @@ LayerModel::headerData(int section, Qt::Orientation orientation, int role) const
       {
          switch (section)
          {
-         case static_cast<int>(Column::EnabledMap1):
+         case static_cast<int>(Column::DisplayMap1):
             return tr("1");
 
-         case static_cast<int>(Column::EnabledMap2):
+         case static_cast<int>(Column::DisplayMap2):
             return tr("2");
 
-         case static_cast<int>(Column::EnabledMap3):
+         case static_cast<int>(Column::DisplayMap3):
             return tr("3");
 
-         case static_cast<int>(Column::EnabledMap4):
+         case static_cast<int>(Column::DisplayMap4):
             return tr("4");
 
          case static_cast<int>(Column::Type):
             return tr("Type");
 
+         case static_cast<int>(Column::Enabled):
+            return tr("Enabled");
+
          case static_cast<int>(Column::Description):
             return tr("Description");
 
@@ -221,17 +267,17 @@ LayerModel::headerData(int section, Qt::Orientation orientation, int role) const
       case static_cast<int>(Column::Order):
          return tr("Order");
 
-      case static_cast<int>(Column::EnabledMap1):
-         return tr("Enabled on Map 1");
+      case static_cast<int>(Column::DisplayMap1):
+         return tr("Display on Map 1");
 
-      case static_cast<int>(Column::EnabledMap2):
-         return tr("Enabled on Map 2");
+      case static_cast<int>(Column::DisplayMap2):
+         return tr("Display on Map 2");
 
-      case static_cast<int>(Column::EnabledMap3):
-         return tr("Enabled on Map 3");
+      case static_cast<int>(Column::DisplayMap3):
+         return tr("Display on Map 3");
 
-      case static_cast<int>(Column::EnabledMap4):
-         return tr("Enabled on Map 4");
+      case static_cast<int>(Column::DisplayMap4):
+         return tr("Display on Map 4");
 
       default:
          break;
@@ -241,10 +287,10 @@ LayerModel::headerData(int section, Qt::Orientation orientation, int role) const
    {
       switch (section)
       {
-      case static_cast<int>(Column::EnabledMap1):
-      case static_cast<int>(Column::EnabledMap2):
-      case static_cast<int>(Column::EnabledMap3):
-      case static_cast<int>(Column::EnabledMap4):
+      case static_cast<int>(Column::DisplayMap1):
+      case static_cast<int>(Column::DisplayMap2):
+      case static_cast<int>(Column::DisplayMap3):
+      case static_cast<int>(Column::DisplayMap4):
       {
          static const QCheckBox checkBox {};
          QStyleOptionButton     option {};
@@ -280,10 +326,10 @@ bool LayerModel::setData(const QModelIndex& index,
 
    switch (index.column())
    {
-   case static_cast<int>(Column::EnabledMap1):
-   case static_cast<int>(Column::EnabledMap2):
-   case static_cast<int>(Column::EnabledMap3):
-   case static_cast<int>(Column::EnabledMap4):
+   case static_cast<int>(Column::DisplayMap1):
+   case static_cast<int>(Column::DisplayMap2):
+   case static_cast<int>(Column::DisplayMap3):
+   case static_cast<int>(Column::DisplayMap4):
       if (role == Qt::ItemDataRole::CheckStateRole)
       {
          // TODO
@@ -351,10 +397,9 @@ void LayerModel::HandlePlacefileRenamed(const std::string& oldName,
    }
    else
    {
-      // Placefile is new, append row
-      const int newIndex = static_cast<int>(p->layers_.size());
-      beginInsertRows(QModelIndex(), newIndex, newIndex);
-      p->layers_.push_back({LayerType::Placefile, newName});
+      // Placefile is new, prepend row
+      beginInsertRows(QModelIndex(), 0, 0);
+      p->layers_.push_front({LayerType::Placefile, newName});
       endInsertRows();
    }
 }
@@ -380,10 +425,9 @@ void LayerModel::HandlePlacefileUpdate(const std::string& name)
    }
    else
    {
-      // Placefile is new, append row
-      const int newIndex = static_cast<int>(p->layers_.size());
-      beginInsertRows(QModelIndex(), newIndex, newIndex);
-      p->layers_.push_back({LayerType::Placefile, name});
+      // Placefile is new, prepend row
+      beginInsertRows(QModelIndex(), 0, 0);
+      p->layers_.push_front({LayerType::Placefile, name});
       endInsertRows();
    }
 }
diff --git a/scwx-qt/source/scwx/qt/model/layer_model.hpp b/scwx-qt/source/scwx/qt/model/layer_model.hpp
index bb7c4828..0a0a46bd 100644
--- a/scwx-qt/source/scwx/qt/model/layer_model.hpp
+++ b/scwx-qt/source/scwx/qt/model/layer_model.hpp
@@ -2,6 +2,7 @@
 
 #include <scwx/qt/types/text_event_key.hpp>
 #include <scwx/common/geographic.hpp>
+#include <scwx/util/iterator.hpp>
 
 #include <memory>
 
@@ -14,21 +15,22 @@ namespace qt
 namespace model
 {
 
-class LayerModelImpl;
-
 class LayerModel : public QAbstractTableModel
 {
 public:
    enum class Column : int
    {
       Order       = 0,
-      EnabledMap1 = 1,
-      EnabledMap2 = 2,
-      EnabledMap3 = 3,
-      EnabledMap4 = 4,
+      DisplayMap1 = 1,
+      DisplayMap2 = 2,
+      DisplayMap3 = 3,
+      DisplayMap4 = 4,
       Type        = 5,
-      Description = 6
+      Enabled     = 6,
+      Description = 7
    };
+   typedef scwx::util::Iterator<Column, Column::Order, Column::Description>
+      ColumnIterator;
 
    enum class LayerType
    {
@@ -63,8 +65,8 @@ public slots:
    void HandlePlacefileUpdate(const std::string& name);
 
 private:
-   friend class LayerModelImpl;
-   std::unique_ptr<LayerModelImpl> p;
+   class Impl;
+   std::unique_ptr<Impl> p;
 };
 
 } // namespace model
diff --git a/scwx-qt/source/scwx/qt/ui/layer_dialog.cpp b/scwx-qt/source/scwx/qt/ui/layer_dialog.cpp
index 3df3b06d..88d3515e 100644
--- a/scwx-qt/source/scwx/qt/ui/layer_dialog.cpp
+++ b/scwx-qt/source/scwx/qt/ui/layer_dialog.cpp
@@ -39,19 +39,16 @@ LayerDialog::LayerDialog(QWidget* parent) :
 
    layerViewHeader->setMinimumSectionSize(10);
 
-   // Enabled columns have a fixed size (checkbox)
-   layerViewHeader->setSectionResizeMode(
-      static_cast<int>(model::LayerModel::Column::EnabledMap1),
-      QHeaderView::ResizeMode::ResizeToContents);
-   layerViewHeader->setSectionResizeMode(
-      static_cast<int>(model::LayerModel::Column::EnabledMap2),
-      QHeaderView::ResizeMode::ResizeToContents);
-   layerViewHeader->setSectionResizeMode(
-      static_cast<int>(model::LayerModel::Column::EnabledMap3),
-      QHeaderView::ResizeMode::ResizeToContents);
-   layerViewHeader->setSectionResizeMode(
-      static_cast<int>(model::LayerModel::Column::EnabledMap4),
-      QHeaderView::ResizeMode::ResizeToContents);
+   // Give small columns a fixed size
+   for (auto column : model::LayerModel::ColumnIterator())
+   {
+      if (column != model::LayerModel::Column::Description)
+      {
+         layerViewHeader->setSectionResizeMode(
+            static_cast<int>(column),
+            QHeaderView::ResizeMode::ResizeToContents);
+      }
+   }
 }
 
 LayerDialog::~LayerDialog()
diff --git a/scwx-qt/source/scwx/qt/ui/layer_dialog.ui b/scwx-qt/source/scwx/qt/ui/layer_dialog.ui
index 18b937c8..83c63f9e 100644
--- a/scwx-qt/source/scwx/qt/ui/layer_dialog.ui
+++ b/scwx-qt/source/scwx/qt/ui/layer_dialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>700</width>
+    <height>600</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -43,6 +43,9 @@
         <property name="selectionMode">
          <enum>QAbstractItemView::ContiguousSelection</enum>
         </property>
+        <property name="indentation">
+         <number>0</number>
+        </property>
        </widget>
       </item>
       <item>
@@ -131,7 +134,7 @@
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
-             <height>60</height>
+             <height>209</height>
             </size>
            </property>
           </spacer>
@@ -143,13 +146,60 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+    <widget class="QFrame" name="frame_3">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
      </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close</set>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
      </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLineEdit" name="lineEdit">
+        <property name="placeholderText">
+         <string>Filter</string>
+        </property>
+        <property name="clearButtonEnabled">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QDialogButtonBox" name="buttonBox">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="standardButtons">
+         <set>QDialogButtonBox::Close</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
   </layout>