Merge "Change grid decoratoration to match spec" into pi-car-dev