Added notification user template
Improved notification system