refactored events controller and fixed events views