diff --git a/Freewood-OctoWoW-Core.toc b/Freewood-OctoWoW-Core.toc
index e5dfda0..cb0247d 100644
--- a/Freewood-OctoWoW-Core.toc
+++ b/Freewood-OctoWoW-Core.toc
@@ -3,7 +3,7 @@
 ## Notes: Base addon of the Freewood family: data storage, UI kit, export/import and the main window.
 ## Notes-deDE: Basis-Addon der Freewood-Familie: Datenspeicher, UI-Bausteine, Export/Import und Hauptfenster.
 ## Author: Lacustat
-## Version: 0.1.237
+## Version: 0.1.238
 ## SavedVariables: FreewoodDB
 ## SavedVariablesPerCharacter: FreewoodCharDB
 
diff --git a/UI/WhisperPopups.lua b/UI/WhisperPopups.lua
index 1a306d7..57d9fd8 100644
--- a/UI/WhisperPopups.lua
+++ b/UI/WhisperPopups.lua
@@ -43,7 +43,11 @@ local function InfoText(name)
     local parts = {}
     if r.l then parts[table.getn(parts) + 1] = tostring(r.l) end
     if r.r then parts[table.getn(parts) + 1] = r.r end
-    local cn = r.cn or r.c
+    local cn = r.cn
+    if not cn and r.c then
+        cn = (G.LOCALIZED_CLASS_NAMES_MALE and G.LOCALIZED_CLASS_NAMES_MALE[r.c])
+            or (string.upper(string.sub(r.c, 1, 1)) .. string.lower(string.sub(r.c, 2)))
+    end
     if cn then parts[table.getn(parts) + 1] = cn end
     local txt = table.concat(parts, " ")
     if r.g and r.g ~= "" then txt = "<" .. r.g .. "> " .. txt end
@@ -108,7 +112,7 @@ local function Create(name)
 
     local head = CreateFrame("Button", nil, win)
     head:SetPoint("TOPLEFT", win, "TOPLEFT", 0, 0)
-    head:SetPoint("TOPRIGHT", win, "TOPRIGHT", 0, 0)
+    head:SetPoint("TOPRIGHT", win, "TOPRIGHT", -96, 0)   -- Knoepfe liegen ausserhalb der Zugflaeche
     head:SetHeight(44)
     head:RegisterForDrag("LeftButton")
     head:SetScript("OnDragStart", function() win:StartMoving() end)
@@ -127,12 +131,14 @@ local function Create(name)
 
     local close = UI.CreateButton(win, "x", 24, 22, function() Hide(win, false) end)
     close:SetPoint("TOPRIGHT", win, "TOPRIGHT", -6, -6)
+    close:SetFrameLevel(head:GetFrameLevel() + 3)
     local tab = UI.CreateButton(win, L.POP_TAB, 52, 22, function()
         CL.requestKey = "w:" .. name
         Hide(win, false)
         if UI.Show then UI:Show("channels") end
     end)
     tab:SetPoint("RIGHT", close, "LEFT", -4, 0)
+    tab:SetFrameLevel(head:GetFrameLevel() + 3)
 
     local logBox = UI.CreatePanel(win, "bg", "bronze")
     logBox:SetPoint("TOPLEFT", win, "TOPLEFT", 8, -48)