Added room for an optional user avatar.