Use grid silently, simplify markup