Added some event styling
Resolved merge conflict
Added stub event date