Replaced deprecated jQuery live methods with on