Change table design to match our table design
Add a label to tables