closed #12 edit controller and ui create wd
Merge branch 'issue-12'