updated click listeners. Still a lot to do.