Added JS and changes in UI