fixed javascript bug, Updated css
Fixed merge conflicts