Move on_draw to controller