added tooltip and changed event view