Layout params better

Also, bump to RC2