Fix notifications and Cosmetics