Layout upgrade #2