Updated major component files, HTML, js and css

Further modification of JS and HTML