Added device checks
Fixing iFrame problems