added SongView; cleaning up