Revamp to grid + node