Updating the pages

Cleaning up a bit
Cleaned up the rest of the pages