More updates to the tools box for demos

1) temp fix for unpadded dates in the table mask
2) clean up more hardcoding issues — some remain will fix later