Added Notifications ... and also made it look nicer