Upgrades for R layouts