Some modifications to nowPlaying and toggle wrappers