Added table as a separate row
Clean up some comments, fixed alerts
Fixed alerts, renamed Order tables