Added Event Calendar and also few code changes.