Fixed the Notification Margins
Some minor refactoring