Fix conflict
Fix live update ajax button