Add trainer ordering and user icon fallback