Fix bug and add tab notificator feature