Some styling upgrades