Merge pull request #1104 from ahomatthew/develop

Quick table tweaks
Quick fix for table