Be more conservative with the notifications we show the user, fix bugs
with notification buttons.