Copied view files
Merge branch 'recovery' into articles