diff --git a/songs/George Michael/Faith.tex b/songs/George Michael/Faith.tex
index 213c208..f7c285c 100644
--- a/songs/George Michael/Faith.tex	
+++ b/songs/George Michael/Faith.tex	
@@ -1,8 +1,8 @@
 \documentclass{skrul-leadsheet}
 
 \begin{document}
-\begin{song}{title={Faith}, band={George Michael}, year={1987}, key={B}}
 
+\begin{song}{title={Faith}, band={George Michael}, year={1987}, key={B}}
 \begin{intro}
 _{B}
 \end{intro}
@@ -37,21 +37,23 @@ Oh baby I rec^{E}onsider my fool^{B}ish ^{G#m}notion \\
 Well I ^{C#m}need someone to hold me but I'll ^{F#}wait for something more
 \end{prechorus}
 
-\begin{chorus}
+\begin{info}
 \instruction{Repeat Chorus}
-\end{chorus}
\begin{solo}
+\end{info}
+
+\begin{solo}
 _{B} Mmm mmm doo mmm doo  _{B} Doo doo doo doo doo \\
 _{E} Doo hummm doo humm doo _{B} I just  had to wait cuz I gotta have \\
 _{B} Faith \space\space\space\space\space\space\space\space\space\space _{B} \space\space\space\space\space\space\space\space I gotta have \\
 _{E} Faith... \space\space\space\space\space\space _{B} Got to got to got to have faith
 \end{solo}
 
-\begin{prechorus}
\instruction{Repeat Second Prechorus}
-\end{prechorus}
+\begin{info}
\instruction{Repeat second Prechorus}
+\end{info}
 
-\begin{chorus}
+\begin{info}
 \instruction{Repeat Chorus}
-\end{chorus}
+\end{info}
 
 \end{song}
 \end{document}
diff --git a/songs/R.E.M./Fall on Me.tex b/songs/R.E.M./Fall on Me.tex
index 3395e5a..c4e914b 100644
--- a/songs/R.E.M./Fall on Me.tex	
+++ b/songs/R.E.M./Fall on Me.tex	
@@ -29,9 +29,9 @@ Don't ^{C}fall ^{Dm}on ^{F}me ^{G} (What is it up in the air for) (It's gonna fa
 ^{Dm}Buy the ^{G}sky and ^{C}sell the ^{Dm/F}sky and ^{Dm}bleed the sky and ^{G7}tell the sky
 \end{verse}
 
-\begin{chorus}
+\begin{info}
 \instruction{Repeat Chorus}
-\end{chorus}
+\end{info}
 
 \begin{bridge}
 ^{Am} Well I could ^{F}keep it above, ^{Am} But then it ^{Em}wouldn't be sky any^{Am}more \\
@@ -43,9 +43,9 @@ So if I ^{F}send it to you you've got to ^{Dm}promise to keep it ^{G}whole
 And ^{Dm}ask the sky ^{C}and ^{G}ask the sky
 \end{verse}
 
-\begin{chorus}
+\begin{info}
 \instruction{Repeat Chorus 3x}
-\end{chorus}
+\end{info}
 
 \end{song}
 \end{document}
diff --git a/tex/skrul-leadsheet.cls b/tex/skrul-leadsheet.cls
index c4b9059..55a963a 100644
--- a/tex/skrul-leadsheet.cls
+++ b/tex/skrul-leadsheet.cls
@@ -23,13 +23,16 @@
 
 \definesongtitletemplate{leadsheet}{%
 {\large \textbf{\songproperty{title}} - \songproperty{band}}
-{\small // \songproperty{year} // Key: \songproperty{key}}
-\hrule
+{\footnotesize \space\space // \space\space \songproperty{year} \space\space // \space\space key: \songproperty{key}}
+
+\vspace{-0.5\baselineskip}
+\hrulefill
 }
 
 \setleadsheets{
   title-template = leadsheet,
   align-chords=l,
+  verse/numbered,
   chords/format = \bfseries,
   verses-label-format = \itshape
 }