Fix some layout details
Tidy up headers and lyrics page