Couple of visual tweaks