Refactor code, add point widget processing