Misc fixes
Notification button fix