[ANALYZER-457] -- Final tweaks after UX review