Moved avatar macro to view partial