Made some click related improvements