Fixed alert and improved UI
Fixed alert and improved UI