RC2 Layout changes