Blueish fixes to styles and clean-up