Fix 500 editing error
Fix AJAXy buttons from not working on in-page popups