Improve edit table design