put back in moving and selection stuff. also added border for polygons. maybe it works?