Make name and description file as table data field
Merge branch 'developer/amrit'