Moving duplicated code to a new class
Merge branch 'about_view'