Fixed events list reload problem
Added JOML funcitonality and clickable numbers and emails
attemp fix merge conflict
merge resolution #2