Add some UX enhancement