improve rule navigation+*self

Rules