new formatting, cleanup and created extra pages