adapt to latest magot
fix rendering issues