Updated Pages

Some bugs have been found