Mastery - UI Edit base on heuristics
-

minor