Lyrics support
Small design fixes