Use 2-stage clicking for slots and fix some focus bugs