ticket:6 correction in views.py and widgets.py
Merge branch 't6_widgets'