Removed avatar tags in layouts