Refactored partials
Added user following