Updated html/js loading