reverting revert
button hover styles #82217794
updated tests
Merging
Fix tests, tidy up views/styles