Work in progress: notification system
Fix for tabbing bug