diff --git a/docs.tex b/docs.tex
index 8d3c21cf64270a706065b1af4c490dc307a466e2..2f67957ecfc895a536a5807e2d3a88dfaf8e01d0 100644
--- a/docs.tex
+++ b/docs.tex
@@ -313,40 +313,58 @@ Available commands:
 
 \section{Modules \& Areas}
 
-\begin{multicols}{2}
-
 \subsection{Encounters}
 
 Make encounter tables like this:
 
 \begin{verbatim}
 
-  \begin{encounters}{Wonderland}
-
-    Fields & Gardens & Results \\\hline
-
-    \li & Doormouse \\
-    \li & Dodo \\
-    \li \lii Unicorn \\
-    \li \lii Red Queen \\
-    & \lii Black Queen \\
-    & \lii Green Queen \\
+\begin{figure*}[t]
+\begin{nametable}[c|LLLLLLLL,fontupper=\small,]{Enc}
+Rolls & 1 & 2 & 3 & 4 & 5 & 6 & 7 & 8 \\
+\hline
+8 & Villagers & Sulphur Winds & Lightning Storm & Earthquake & Hurricane &
+  Mouthdigger 1 & Woodspy 1 & Forest Fire \\
+7 & Flood & Heatwave & High Humidity & Woodspy 2 & Chitincrawler 1 &
+  Chitincrawler 2 & Bear 1 & Basilisk 1 \\
+6   Guards 1 & Rain & Guard 2 & Rain & Elves 1 & Woodspy 4 &
+  Woodspy 2 & Chitincrawler 3 \\
+5 & Noble & Traders 1 & Bandits 1 & Wolves 1 & Lightning Storm &
+  Gnolls 1 & Deer & Mana Lake \\
+4 & Villagers & Traders 2 & Wind & Bear 2 & Wolves 2 &
+  Mouthdigger 2 & Basilisk 2 & Griffins 1 \\
+3 & Trader 3 & Guards 3 & Traders 4 & Refugees & Gnomes 1 &
+  Gnolls 2 & Brigands & Elves 2 \\
+2 & Traders 5 & Pilgrims & Breeze & Bandits 2 & Mouthdigger 3 &
+  Griffins 2 & boar & Wild Horses \\
+1 & Bard & Dwarves 1 & Dwarves 2 & Griffin 3 & Bandits 3 &
+  Gnomes 2 & Griffins 4 & Aurochs \\
+0 & Begging Villagers & Bandits 4 & Snowfall & Hail & Wolves 3 &
+  Snowstorm & Wolves 4 & Hibernating Chitincrawler 4 \\
+\end{nametable}
+\end{figure*}
 
 \end{verbatim}
 
-\begin{encounters}{Wonderland}
-
-  Fields & Gardens & Results \\\hline
-
-  \li & Doormouse \\
-  \li & Dodo \\
-  \li \lii Unicorn \\
-  \li \lii Red Queen \\
-  & \lii Black Queen \\
-  & \lii Green Queen \\
+(Check below for the results)
 
+\begin{multicols}{2}
 
-\end{encounters}
+\begin{figure*}[t]
+\begin{nametable}[c|LLLLLLLL,fontupper=\small,]{Enc}
+Rolls & 1 & 2 & 3 & 4 & 5 & 6 & 7 & 8 \\
+\hline
+8 & Villagers & Sulphur Winds & Lightning Storm & Earthquake & Hurricane & Mouthdigger 1 & Woodspy 1 & Forest Fire \\
+7 & Flood & Heatwave & High Humidity & Woodspy 2 & Chitincrawler 1 & Chitincrawler 2 & Bear 1 & Basilisk 1 \\
+6 & Guards 1 & Rain & Guard 2 & Rain & Elves 1 & Woodspy 4 & Woodspy 2 & Chitincrawler 3 \\
+5 & Noble & Traders 1 & Bandits 1 & Wolves 1 & Lightning Storm & Gnolls 1 & Deer & Mana Lake \\
+4 & Villagers & Traders 2 & Wind & Bear 2 & Wolves 2 & Mouthdigger 2 & Basilisk 2 & Griffins 1 \\
+3 & Trader 3 & Guards 3 & Traders 4 & Refugees & Gnomes 1 & Gnolls 2 & Brigands & Elves 2 \\
+2 & Traders 5 & Pilgrims & Breeze & Bandits 2 & Mouthdigger 3 & Griffins 2 & boar & Wild Horses \\
+1 & Bard & Dwarves 1 & Dwarves 2 & Griffin 3 & Bandits 3 & Gnomes 2 & Griffins 4 & Aurochs \\
+0 & Begging Villagers & Bandits 4 & Snowfall & Hail & Wolves 3 & Snowstorm & Wolves 4 & Hibernating Chitincrawler 4 \\
+\end{nametable}
+\end{figure*}
 
 And charts about roll successes like this:
 
@@ -389,10 +407,10 @@ You can refer to it with \verb"\nameref{docGift}", such as ``see room number \re
 
 \end{multicols}
 
-\begin{multicols}{2}
-
 \section{Others}
 
+\begin{multicols}{2}
+
 Other commands are typically produced for just a single location in the book.
 
 The functions which produce the creature boxes is a tangled mess of rotten spaghetti-logic, which is so inefficient it somehow taxes a modern computer just to add some numbers.
diff --git a/layout.sty b/layout.sty
index 78bf09a6fec713e654a09213c91652af4b2fd75c..5a3c81d3dd3dae594ca0d9eb7148a79ba6c6d7ea 100644
--- a/layout.sty
+++ b/layout.sty
@@ -726,6 +726,7 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 \setlength\intextsep{0em}
 
 \newcolumntype{Y}{>{\centering\arraybackslash}X}
+\newcolumntype{L}{>{\raggedright\arraybackslash}X}
 
 \newcommand{\currentsphere}{magic}