Some visual tweaks and improvements