Some form markup changes
Refactor incoming events to use Date instead of unix timestamp