xeditable integration
refactoring