added menu-improvements from draw_model_icon-branch