More instances of .live() and .die() replaced with .on() and .off()

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>