Updated onClick handlers