Some more visual tweaks and improvements