Get new LAYOUT types correct