Event hompage fix
clearfix merge conflict