Fix supporting new page layout

Old version of page layout is still available.