Fix event text overflow and color tweaking
Merge branch 'master' into gh-pages
deploy