Tweaked js; beautified html