Minor changes, added the notification box