diff --git a/scwx-qt/source/scwx/qt/map/alert_layer.cpp b/scwx-qt/source/scwx/qt/map/alert_layer.cpp
index c88f6220..7c5c9db2 100644
--- a/scwx-qt/source/scwx/qt/map/alert_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/alert_layer.cpp
@@ -229,7 +229,10 @@ public:
 
 AlertLayer::AlertLayer(std::shared_ptr<MapContext> context,
                        awips::Phenomenon           phenomenon) :
-    DrawLayer(context), p(std::make_unique<Impl>(this, context, phenomenon))
+    DrawLayer(
+       context,
+       fmt::format("AlertLayer {}", awips::GetPhenomenonText(phenomenon))),
+    p(std::make_unique<Impl>(this, context, phenomenon))
 {
    for (auto alertActive : {false, true})
    {
diff --git a/scwx-qt/source/scwx/qt/map/draw_layer.cpp b/scwx-qt/source/scwx/qt/map/draw_layer.cpp
index c39b9f4c..13d06780 100644
--- a/scwx-qt/source/scwx/qt/map/draw_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/draw_layer.cpp
@@ -20,11 +20,13 @@ static const auto        logger_    = scwx::util::Logger::Create(logPrefix_);
 class DrawLayerImpl
 {
 public:
-   explicit DrawLayerImpl(std::shared_ptr<MapContext> context) :
+   explicit DrawLayerImpl(std::shared_ptr<MapContext> context,
+                          const std::string&          imGuiContextName) :
        context_ {std::move(context)}, drawList_ {}
    {
-      static size_t currentMapId_ {0u};
-      imGuiContextName_ = fmt::format("Layer {}", ++currentMapId_);
+      static size_t currentLayerId_ {0u};
+      imGuiContextName_ =
+         fmt::format("{} {}", imGuiContextName, ++currentLayerId_);
       // This must be initialized after the last line
       // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
       imGuiContext_ =
@@ -65,8 +67,10 @@ public:
    bool          imGuiRendererInitialized_ {};
 };
 
-DrawLayer::DrawLayer(const std::shared_ptr<MapContext>& context) :
-    GenericLayer(context), p(std::make_unique<DrawLayerImpl>(context))
+DrawLayer::DrawLayer(const std::shared_ptr<MapContext>& context,
+                     const std::string&                 imGuiContextName) :
+    GenericLayer(context),
+    p(std::make_unique<DrawLayerImpl>(context, imGuiContextName))
 {
 }
 DrawLayer::~DrawLayer() = default;
diff --git a/scwx-qt/source/scwx/qt/map/draw_layer.hpp b/scwx-qt/source/scwx/qt/map/draw_layer.hpp
index 8bfe8a5d..6cfa5aae 100644
--- a/scwx-qt/source/scwx/qt/map/draw_layer.hpp
+++ b/scwx-qt/source/scwx/qt/map/draw_layer.hpp
@@ -15,7 +15,8 @@ class DrawLayerImpl;
 class DrawLayer : public GenericLayer
 {
 public:
-   explicit DrawLayer(const std::shared_ptr<MapContext>& context);
+   explicit DrawLayer(const std::shared_ptr<MapContext>& context,
+                      const std::string&                 imGuiContextName);
    virtual ~DrawLayer();
 
    virtual void Initialize() override;
diff --git a/scwx-qt/source/scwx/qt/map/map_context.hpp b/scwx-qt/source/scwx/qt/map/map_context.hpp
index 57640263..680f9ddd 100644
--- a/scwx-qt/source/scwx/qt/map/map_context.hpp
+++ b/scwx-qt/source/scwx/qt/map/map_context.hpp
@@ -38,19 +38,21 @@ public:
    MapContext(MapContext&&) noexcept;
    MapContext& operator=(MapContext&&) noexcept;
 
-   std::weak_ptr<QMapLibre::Map>             map() const;
-   std::string                               map_copyrights() const;
-   MapProvider                               map_provider() const;
-   MapSettings&                              settings();
-   QMargins                                  color_table_margins() const;
-   float                                     pixel_ratio() const;
-   common::Coordinate                        mouse_coordinate() const;
-   std::shared_ptr<view::OverlayProductView> overlay_product_view() const;
-   std::shared_ptr<view::RadarProductView>   radar_product_view() const;
-   common::RadarProductGroup                 radar_product_group() const;
-   std::string                               radar_product() const;
-   int16_t                                   radar_product_code() const;
-   [[nodiscard]] QWidget*                    widget() const;
+   [[nodiscard]] std::weak_ptr<QMapLibre::Map> map() const;
+   [[nodiscard]] std::string                   map_copyrights() const;
+   [[nodiscard]] MapProvider                   map_provider() const;
+   [[nodiscard]] MapSettings&                  settings();
+   [[nodiscard]] QMargins                      color_table_margins() const;
+   [[nodiscard]] float                         pixel_ratio() const;
+   [[nodiscard]] common::Coordinate            mouse_coordinate() const;
+   [[nodiscard]] std::shared_ptr<view::OverlayProductView>
+   overlay_product_view() const;
+   [[nodiscard]] std::shared_ptr<view::RadarProductView>
+                                           radar_product_view() const;
+   [[nodiscard]] common::RadarProductGroup radar_product_group() const;
+   [[nodiscard]] std::string               radar_product() const;
+   [[nodiscard]] int16_t                   radar_product_code() const;
+   [[nodiscard]] QWidget*                  widget() const;
 
    void set_map(const std::shared_ptr<QMapLibre::Map>& map);
    void set_map_copyrights(const std::string& copyrights);
diff --git a/scwx-qt/source/scwx/qt/map/marker_layer.cpp b/scwx-qt/source/scwx/qt/map/marker_layer.cpp
index 39e43a57..aec23f84 100644
--- a/scwx-qt/source/scwx/qt/map/marker_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/marker_layer.cpp
@@ -129,7 +129,8 @@ void MarkerLayer::Impl::ReloadMarkers()
 }
 
 MarkerLayer::MarkerLayer(const std::shared_ptr<MapContext>& context) :
-    DrawLayer(context), p(std::make_unique<MarkerLayer::Impl>(this, context))
+    DrawLayer(context, "MarkerLayer"),
+    p(std::make_unique<MarkerLayer::Impl>(this, context))
 {
    AddDrawItem(p->geoIcons_);
 }
diff --git a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp
index 53557222..3522ba40 100644
--- a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp
@@ -143,7 +143,8 @@ public:
 };
 
 OverlayLayer::OverlayLayer(std::shared_ptr<MapContext> context) :
-    DrawLayer(context), p(std::make_unique<OverlayLayerImpl>(this, context))
+    DrawLayer(context, "OverlayLayer"),
+    p(std::make_unique<OverlayLayerImpl>(this, context))
 {
    AddDrawItem(p->activeBoxOuter_);
    AddDrawItem(p->activeBoxInner_);
diff --git a/scwx-qt/source/scwx/qt/map/overlay_product_layer.cpp b/scwx-qt/source/scwx/qt/map/overlay_product_layer.cpp
index 64745fd5..76eeaa8b 100644
--- a/scwx-qt/source/scwx/qt/map/overlay_product_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/overlay_product_layer.cpp
@@ -109,7 +109,8 @@ public:
 };
 
 OverlayProductLayer::OverlayProductLayer(std::shared_ptr<MapContext> context) :
-    DrawLayer(context), p(std::make_unique<Impl>(this, context))
+    DrawLayer(context, "OverlayProductLayer"),
+    p(std::make_unique<Impl>(this, context))
 {
    auto overlayProductView = context->overlay_product_view();
    connect(overlayProductView.get(),
diff --git a/scwx-qt/source/scwx/qt/map/placefile_layer.cpp b/scwx-qt/source/scwx/qt/map/placefile_layer.cpp
index be2d9a18..df9828eb 100644
--- a/scwx-qt/source/scwx/qt/map/placefile_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/placefile_layer.cpp
@@ -66,7 +66,7 @@ public:
 
 PlacefileLayer::PlacefileLayer(const std::shared_ptr<MapContext>& context,
                                const std::string& placefileName) :
-    DrawLayer(context),
+    DrawLayer(context, fmt::format("PlacefileLayer {}", placefileName)),
     p(std::make_unique<PlacefileLayer::Impl>(this, context, placefileName))
 {
    AddDrawItem(p->placefileImages_);
diff --git a/scwx-qt/source/scwx/qt/map/radar_site_layer.cpp b/scwx-qt/source/scwx/qt/map/radar_site_layer.cpp
index 1cb5e222..65b53f14 100644
--- a/scwx-qt/source/scwx/qt/map/radar_site_layer.cpp
+++ b/scwx-qt/source/scwx/qt/map/radar_site_layer.cpp
@@ -44,7 +44,7 @@ public:
 };
 
 RadarSiteLayer::RadarSiteLayer(std::shared_ptr<MapContext> context) :
-    DrawLayer(context), p(std::make_unique<Impl>(this))
+    DrawLayer(context, "RadarSiteLayer"), p(std::make_unique<Impl>(this))
 {
 }