CC: more visual tweaks