Corrected Notifications Bug

updated JS and templates