changed order of js
Merge branch 'edit'