Merge table back to core
Fix table grid
Edit