Some UI improvements

Clarify functionality.