Fix table headers in Event Configuration
Merge remote-tracking branch 'scott/master'