Click&Go improvements