Redo songs page; Update to latest diddleman