Updated UX/UI for popup & removed badge