js tidied up and hopefully now fixed the issue with it not working properly on iphone
Merge remote-tracking branch 'origin/master'