#286 Update edit.php design
Merge branch 'version2.1' into version2.2