Namerefactoring
Fixed hover info scroll issue