Highlight active users
fixed the hover issue
fixed merge conflicts