A few more styling upgrades