New grid in place according to last design from Marco