Minor changes for better UX
Minor changes for better UX