Improvements to hover