Better notification button management