Small adjusts on JS