Add layout shims