Layout upgrade