Tweak right column styles
Simplify whitelist matching logic