A couple of UI updates...