Optimize queries
User page - tweaks & fixes