Modifying edit features

Edit is now more clean
Merge branch 'master' of https://github.com/patrickshao/pweb