improve ui
improve undo redo
Merge branch 'develop'