Update some more UX