Renamed buttons, added alerts