Fix new page
Merge master