Remove and added proper UX