ticket:6 edit widget
Merge branch 't6_ajax'