Fix CSS bug and change JS selector