Removed ugly pop-up and added clean popup to project