Cosmetic tweaks to closer match live design