Cleaning up the presentation and making sure links are valid