Improve complete UX