Fixed update intervals and data click events