Minor UI edits and cleanup