Styling tweaks based on changes

Fixes for the colour issues, and strange hover issues