Updated event view to handle timezone mismatch issue
Fixed conflict.