Changed buttons and notification alert