Avatar layout problem fix