Layout fix, stage added