More improvements to relevanct, triggering and design sections