Removed some old .click events and swapped in .on