fix some javascript issue
final task