2.2 Implement

Small tweaks to views and forms.