added ExtractSurface.* and adapted in 2D view