Update to background and grid layout