modal and drawing reorganization