Change of Formatting

Still some inconsistencies, need to change how the table looks,
modification of some of the pages due to the new format