UI and PDF fixes