Tweaks in views and templates.