added upcoming event div
mass tyling change
added styling and fixed bugs to message views
fix merge