Complete Pdf view refactor