Migrating more buttons to jQuery event listener actions