closed #13 edit ui viewwd and controlloer
Merge branch 'issue-13'