fixed bug - we only repopulate the shapes list if necessary (if a shape has been deleted)
housekeeping
- better looking polylines and cleaner code