Fix layout of math/nonmath