refactored notifications, consolidated nav and notification throughout templates