Made platform independent switching
Play/Pause switching button added
Conflicts resolved