Fix button not reappearing and a JSONP derp