hover fix and simpler values