More minor UI changes including code review feedback.