Geometry Widget 6th commit

- Handle pointer properly
- Fix minor bug