improve object collapse/expand performance
break out click setup into clickSetup() and call appropriately for individual updates