Improved formatting in draw_cw and draw_manager