No more alerts

Changed some UI and fixed a bug