added event countdown
tidied up event page
fixed merge conflicts