Important modal fix + better style toast