all js fixes from notes
merge conflict in views.py