Mostly fixed hover issue