Small rendering fixes/optimisations