closed #3 add ui addjust and controller
Merge branch 'issue-3'