clarify and clean  up UI