diff --git a/layout.sty b/layout.sty
index bf6a37df9fdd70d596bff3cf56fc22e4ecd0e40d..a7b6322ea15a15966fc838d6b1f54b92f9cf061c 100644
--- a/layout.sty
+++ b/layout.sty
@@ -980,10 +980,10 @@ Roll & Result \\
 \newcommand{\mapentry}[2][]{
   \needspace{2em}
   \refstepcounter{list}
-  \subsubsection[#2]{
-    \arabic{list}: #2
+  \subsubsection[#2]{%
+    \arabic{list}: \MakeUppercase#2%
   }
-  \label{#1}
+  \label{#1}%
 }
 
 %%%%% Side Quests