further refinements to UI