Merged notification and notifier classes, added missing stylesheet and fixed a naming error