Show page layout
solve merge conflicts