Refined the UX