diff --git a/verses_with_chords.ly b/verses_with_chords.ly
index 9ca6212..2783dee 100644
--- a/verses_with_chords.ly
+++ b/verses_with_chords.ly
@@ -253,21 +253,17 @@
     #{
       \markup {
         \override #`(baseline-skip . ,intraverse-vspace)
-        \pad-left #-7
         \score-equal-height #verse-line-height \score-lines {
           \transposable #transposition
           <<
             \new Devnull { #verse-break-voice }
+            \new NullVoice = "dummyvoice" { #verse-reference-voice }
             #(music-clone verse-chords)
-            \new NullVoice { #verse-reference-voice }
-            \addlyrics { #lyrics }
+            \new Lyrics \lyricsto "dummyvoice" { #lyrics }
           >>
           \layout {
             \verselayout
-            \context {
-              \Staff
-              \override LeftEdge.space-alist.first-note = #'(fixed-space . 7.0)
-            }
+            ragged-right = ##t
             \context {
               \Lyrics
               \override VerticalAxisGroup.nonstaff-relatedstaff-spacing.basic-distance = #verse-text-chord-distance
@@ -277,9 +273,15 @@
               \override LyricSpace.minimum-distance = 0.8
               \override LyricText.stencil = #custom-lyric-text::print
             }
+            \context {
+              \ChordNames
+              \override VerticalAxisGroup.staff-affinity = ##f
+              \override ChordName.extra-spacing-width = #'(-0.1 . 0.1)
+            }
             \context {
               \Score
               \override PaperColumn.keep-inside-line = ##f
+             % \override SpacingSpanner.strict-note-spacing = ##t
               \override SpacingSpanner.uniform-stretching = ##t
               \override SpacingSpanner.spacing-increment = 0
               \remove Bar_number_engraver
@@ -292,6 +294,8 @@
               \remove Staff_symbol_engraver
               \remove Clef_engraver
               \remove Time_signature_engraver
+              \remove Bar_engraver
+              \remove Separating_line_group_engraver
               \omit KeySignature
               \omit KeyCancellation
             }
@@ -306,6 +310,13 @@
               \remove Dynamic_engraver
               \remove Note_heads_engraver
             }
+            \context {
+              \NullVoice
+              \consists Rest_engraver
+              \omit Rest
+             % \undo \omit NoteHead
+             % \hide NoteHead
+            }
           }
         }
       }