Tidy up & work on dynamic PDF