minor UI updates; including unification of highlighting