Another round of small updates. Mostly for consistency of UI.