Changed jquery .live to .on method