Started adding now playing bar
Merge changes