[IMP] Improved hover function