Tidy up of Discover and play/pause buttons