Fix issues with notification icon popping up whne it shouldn't be Remove rendundant code Added dedicated name support to store heros