Completely remade Notifications and some little fixes