[NGRINDER-697] Simplify UI logics