Website is test of patience

My apologies for not responding sooner. When I wrote that code I was unaware of the code you wrote. We independently made fairly similar changes. AFAIK the changes I made solved the problems, but as I understand you have a wider range of devices for testing on I will leave what code to use at your discretion.