html and js changes

Simplified code base