Implement new design for editting area
fix conflict
Merge branch 'dev' of https://github.com/snwfog/ppedit into dev