More tweaks on the button hovering. I really don't want merge conflicts so I'm committing a lot...