Added noscript handling