Fixed alert and improved UI