Better maxWidth management