Added more UX