Fixed add/remove JS