Refactored some code, made changing things in events modal