remove page reference and change so that the fields are stored.
Merge branch 'master' of github.com:3amice/EDAN70
refactor code and remove comments