diff --git a/config/layout.sty b/config/layout.sty
index 9a4d5cb37a3223004f339c5b463c413750abf595..c1ac492f37c5cc4e120a6c92fc59445e99538f57 100644
--- a/config/layout.sty
+++ b/config/layout.sty
@@ -635,20 +635,42 @@ Roll & Result \\
 
 \newtcolorbox{xpchart}[1]{tabularx={l|p{.8\textwidth}},adjusted title=XP Rewards for #1,bottom=10pt}
 
-\newtcolorbox[use counter=enc, use counter=list]{encounters}[1]{ornamented,adjusted title=Encounters in #1,tabularx={XXp{.6\textwidth}},bottom=10pt,code={\rowcolors{2}{}{gray!10}\setcounter{enc}{19}\setcounter{list}{18}}}
+% this shows encounters, and the two counters below show the encounter number
 
-\newtcolorbox{rollchart}{tabularx={p{.25\linewidth}X},top=10pt,bottom=10pt}
+\newtcolorbox[use counter=enc, use counter=list]{encounters}[1]{
+	ornamented,
+	adjusted title=Encounters in #1,
+	tabularx={XXp{.6\textwidth}},
+	bottom=10pt,
+	code={\rowcolors{2}{}{gray!10}\setcounter{enc}{19}\setcounter{list}{18}}}
 
-\newtcolorbox{xpbox}[1]{tabularx={lX},bottom=10pt,top=10pt,equal height group=#1}
+\newcommand{\li}{\addtocounter{enc}{-1}\arabic{enc}&}
+\newcommand{\lii}{\addtocounter{list}{-1}\arabic{list}&}
+
+\newtcolorbox{rollchart}{
+	tabularx={p{.25\linewidth}X},
+	top=10pt,
+	bottom=10pt}
+
+\newtcolorbox{xpbox}[1]{
+	tabularx={lX},
+	bottom=10pt,
+	top=10pt,
+	equal height group=#1}
 
 
 %%%%%%%%%%%%%%%%%%% COMMANDS %%%%%%%%%%%%%%%%%%%%
 
 \newcommand{\story}[2]{%
-\subsubsection{#2}
-Cost: #1\par\noindent}
+	\subsubsection{#2}
+	Cost: #1\par\noindent
+}
 
-\newcommand{\best}[2][\C]{\npc{#1}{#2}\subsubsection{#2}\index{Antagonists!#2}}
+\newcommand{\best}[2][\C]{
+	\npc{#1}{#2}
+	\subsubsection{#2}
+	\index{Antagonists!#2}
+}
 
 \newcounter{random}
 \setcounter{random}{1}
@@ -728,9 +750,12 @@ Cost: #1\par\noindent}
 	\ifnum\value{age}>0\addtocounter{r12}{\value{age}}\else\ifnum\value{r4}>0\addtocounter{r12}{\value{r4}}\else\addtocounter{r12}{3}\fi\fi%
 }
 
-\newcommand{\mapentry}[1]{\needspace{2em}\addtocounter{list}{1}\subsubsection[#1]{\arabic{list}: #1}}
-\newcommand{\li}{\addtocounter{enc}{-1}\arabic{enc}&}
-\newcommand{\lii}{\addtocounter{list}{-1}\arabic{list}&}
+\newcommand{\mapentry}[1]{
+	\needspace{2em}
+	\addtocounter{list}{1}
+	\subsubsection[#1]{
+		\arabic{list}: #1}
+	}
 
 %%%%% Side Quests