add click tracking and re-ordering