Refactored web pages & js to use data-attrvtags