Modified JS,HTML and Testcases