Improve definition forms schema
Cleaner table headers