Add better handling of no javscript