Working on the new page functionality