Improved rendering for carriage rotator

Stable enough for a release - expect one soon if I don't find any
problems