Added views and controller
Merge branch 'recovery' into articles
Add views and controllers