Fix and remove Viewer's draw functions