updated new format to all pages