diff --git a/magic.sty b/magic.sty
index d24be52779cbc16a6dec208f1b97f7e9d0bfd83a..cdd03cacf07b7450a239d835e0c567ebc9cad4d8 100644
--- a/magic.sty
+++ b/magic.sty
@@ -11,6 +11,8 @@
 % Some spells inflict X fatigue, where X is the spell level plus 2.
 \newcounter{spellCost}
   \setcounter{spellCost}{1}
+\newcounter{spellPlusOne}
+  \setcounter{spellPlusOne}{1}
 \newcounter{spellPlusTwo}
   \setcounter{spellPlusTwo}{1}
 \newcounter{spellPlusThree}
@@ -86,6 +88,8 @@
     \ifdefstring{\d}{duplicated}{\global\toggletrue{duplicated}}{}%
     \stepcounter{spellCost}%
   }%
+  \setcounter{spellPlusOne}{\value{spellCost}}%
+    \addtocounter{spellPlusOne}{1}%
   \setcounter{spellPlusTwo}{\value{spellCost}}%
     \addtocounter{spellPlusTwo}{2}%
   \setcounter{spellPlusThree}{\value{spellCost}}%
@@ -124,31 +128,23 @@
 
 \newcommand\fullSpell{%
   \needspace{4em}
-  \begin{tabularx}{\linewidth}{YX}
-  \adforn{24}~\textbf{\scshape\large\spellName}~\adforn{52}
+  \begin{tabularx}{\linewidth}{m{.28\linewidth}X}
+  \raggedright
+  \textbf{\titleFont\large\spellName}
   &
     \small
-    \noindent
-    \textbf{\scshape Requirements}
-    \spellSphere
+    \textbf{\scshape Requirements:}
+    \spellSphere~\arabic{spellCost}
 
-    \noindent
-    \textbf{\scshape Cost}
-    \arabic{spellCost} \glsentrytext{mp}
+    \textbf{\scshape Resisted~by:}
+    \spellResistance
 
-    \noindent
-    \textbf{\scshape Range}
+    \textbf{\scshape Range:}
     \spellRange%
-
-    \ifnumcomp{\value{spellTargets}}{>}{1}{%
-      \noindent
-      \textbf{\scshape Targets}
+    \ifnumcomp{\value{spellTargets}}{>}{1}{
+      \textbf{\scshape Targets:}
       \arabic{spellTargets}%
     }{}
-
-    \noindent
-    \textbf{\scshape Resisted~by:}
-    \spellResistance
   \\
   \end{tabularx}
   \noindent