This also fixes all the weirdness on notification buttons reference #38

Signed-off-by: Suki <suki@missallsunday.com>