Table Design Fixes