Make *_draw functions consistant