add table header hierarchy
New views for table
Merge conflicts
Add client validation