Fixed alerts and added Manual Entry button