Merge pull request #28 from diaarezz/master

update edit n form page