diff --git a/config/layout.sty b/config/layout.sty
index 4816b6b4417d5c91b3f9e4ee3e495f07917cec69..5e5a89c9dc5be607ddffebe8e0f26c2ef975a2c8 100644
--- a/config/layout.sty
+++ b/config/layout.sty
@@ -1,4 +1,5 @@
-\ProvidesPackage{layout}
+\ProvidesPackage{config/layout}
+
 \RequirePackage[table]{xcolor}
 \RequirePackage[acronym]{glossaries}
 \setacronymstyle{short-long-desc}
@@ -37,6 +38,7 @@
 \RequirePackage{tikz}
 	\usetikzlibrary{calc,mindmap,trees}% calc for fancy borders
 	\usetikzlibrary{intersections}% for very fancy borders with intersecting lines
+	\usetikzlibrary{shapes.misc}% for very fancy \section
 \RequirePackage{pifont}
 \RequirePackage{colortbl}
 \RequirePackage[poster]{tcolorbox}
@@ -463,20 +465,22 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 {\Huge}
 
 
-\titleformat{\section}[frame]
-{\needspace{20em}\normalfont}
-{\filright
-\footnotesize
-\enspace SECTION \thesection\enspace}
-{8pt}
-{\Large\bfseries\filcenter}
-
-\titleformat{\subsection}%
-	{\needspace{13em}\center\large\bfseries}%
-	{}%
-	{1em}%
-	{}%
-	[\rule{.9\linewidth}{.2pt}]
+\newcommand\titlebar{%
+\tikz[baseline,trim left=1em,trim right=3cm] {
+    \fill [\pageSideColor] (2.5cm,-1ex) rectangle (\linewidth+1.5em,2.5ex);
+    \node [
+        fill=white,
+	text= \pageSideColor,
+        anchor= base east,
+        rounded rectangle,
+        minimum height=3.5ex] at (2.9cm,0) {
+        \textbf{\arabic{section}}
+    };
+}%
+}
+\titleformat{\section}{\large\needspace{8em}}{\titlebar}{0.1cm}{\textcolor{white}}
+\renewcommand*{\thesection}{\arabic{section}}
+
 %
 \titleformat{\subsubsection}
 {\needspace{4em}\normalfont\normalsize\bfseries}{\thesubsubsection}{1em}{}
@@ -512,8 +516,6 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 \newcommand{\N}{\leftmoon} % nura
 \newcommand{\D}{\fullmoon} % undead
 
-\newcommand{\monster}[1]{\needspace{4em}\vspace{.38cm} \ding{70} #1 \ding{70}\vspace{.18cm}}
-
 %%%%%%%%%%%%%%%%%%%% TOGGLES %%%%%%%%%%%%%%%%%%%%
 
 \newtoggle{verbose}
diff --git a/config/loot.sty b/config/loot.sty
index 9748722faaeef01dea8405b01838639e9d44ab6e..df2b2c09d0dbcab3735b53dd4a60f1eebe666cf2 100644
--- a/config/loot.sty
+++ b/config/loot.sty
@@ -1,4 +1,5 @@
-\ProvidesPackage{config/stats}
+\ProvidesPackage{config/loot}
+
 %%%%%%%%%%%%%%%%%%%% LOOT %%%%%%%%%%%%%%%%%%%%
 
 \newcommand{\lootSmall}{%
diff --git a/config/monsters.sty b/config/monsters.sty
index 66266c745560d32c99e32663f255989ecefab305..9cf357c45639f6869027da90e80ef4dcf0e5b41a 100644
--- a/config/monsters.sty
+++ b/config/monsters.sty
@@ -1,3 +1,5 @@
+\ProvidesPackage{config/monsters}
+
 %                              _                
 %    _ __ ___   ___  _ __  ___| |_ ___ _ __ ___ 
 %   | '_ ` _ \ / _ \| '_ \/ __| __/ _ \ '__/ __|
diff --git a/config/stats.sty b/config/stats.sty
index 84f3a5eb1e6ad6b5cde5c40e3700453a0a88e43f..50344dba5d482d931b3419de83edc2e8588c92e1 100644
--- a/config/stats.sty
+++ b/config/stats.sty
@@ -388,7 +388,9 @@
 % Reference versions (which always are non-verbose) don't
 % have the space for full-sized stats.
 
-\iftoggle{verbose}{}{
+\iftoggle{verbose}{
+	\begin{small}%
+}{%
 	\begin{footnotesize}
 }
 
@@ -443,9 +445,11 @@
 
 \vspace{.1cm}
 
-\iftoggle{verbose}{}{
-	\end{footnotesize}
-}
+\iftoggle{verbose}{%
+	\end{small}%
+}{%
+	\end{footnotesize}%
+}%
 }
 
 %%     _               _        _
diff --git a/config/test.tex b/config/test.tex
index 27f3a94cf12ab0660573af7fed61b912932570ac..254962f7729540df70bfaca7a30b8901896898ad 100644
--- a/config/test.tex
+++ b/config/test.tex
@@ -114,7 +114,9 @@ Roll & Result \\\hline
 
 \end{multicols}
 
-\chapter{Humanoids}
+\chapter{Stat Blocks}
+
+\section{Humanoids}
 
 \begin{multicols}{2}
 
@@ -178,7 +180,7 @@ Roll & Result \\\hline
 
 \end{multicols}
 
-\chapter{Forest Critters}
+\section{Forest Critters}
 
 \begin{multicols}{2}
 
@@ -192,7 +194,7 @@ Roll & Result \\\hline
 
 \end{multicols}
 
-\chapter{Undead}
+\section{Undead}
 
 \begin{multicols}{2}
 
@@ -246,6 +248,8 @@ Roll & Result \\\hline
 
 \chapter{Outsiders}
 
+\section{Weird Ones}
+
 \begin{multicols}{2}
 
 \archmage
@@ -260,6 +264,22 @@ Roll & Result \\\hline
 
 \end{multicols}
 
+\section{Same}
+
+\begin{multicols}{2}
+
+\rockman
+
+\archmage
+
+\dragon
+
+\archmage
+
+\lavaman
+
+\end{multicols}
+
 \chapter{Bestiary Chapters}
 
 \begin{multicols}{2}
@@ -407,7 +427,53 @@ When using a bestiary chapter, the stats appear as dice rolls, rather than fixed
 \noindent
 \lipsum
 
+\end{multicols}
+
+\newcommand{\tests}{
+
+\chapter{Another Test}
+
+\section{Test Section}
+
+\begin{multicols}{2}
+
+\lipsum[3]
+
+\humanbard
+
+\lipsum[2]
+
+\subsection{Test subsection}
+
+\elf
+
+\lipsum[3]
+
+\elf
+
+\subsubsection{Test sub-sub-section}
+
+\lipsum[10]
+
+\subsubsection{Test sub-sub-section again}
+
+
+\subsection{Test subsection}
+
+\lipsum[2]
+
+\elf
+
+\lipsum[10]
+
+\section{Last Section}
+
+\lipsum[3]
 
 \end{multicols}
 
+}
+
+\Repeat{4}{\tests}
+
 \end{document}