Made some changes to the pages and editor modules