Improved hover style changes handling