Fixed issue 18 js
Fixed 18 js and js in document ready to window load