More graphic tweaks