Refactoring controllers
Merge branch 'feature/social_bugs_fix_79' into staging