UCP styling tweaks