UX clean up updates