Updated Alerts;  Updated shop screen