A couple more visual tweaks