Click bug fixes