I just convert all my pdf's to epub. It's a pain, but worthwhile long term. Calibre does a good job, but you need to know some regex to clean up the view and avoid stuff like repetitive title and page number.