A couple more UI updates...