DC/Melanie |#3840 #3863| Ui changes and adding PDF's