[Panda] More layout fix.