Adding changes for UX