More improvements to Retina sample - cleanup and text rendering