Added nowplaying view
 merge