Fixed most of the pages