Avatar page fixes