Add rider view, refactor event view