button updates and notification fix