Uses \voiceOne and \voiceTwo to fix the layout problems

fixes #2