JS changes
changed html order
resolved merge issue