added better mouse interaction