Fixed according to Dale's comments

Moved dispatch table row to be inner class
Fixed header dates and other header stuff