Made some changes at the pages