Switch from using live() to on()