Updated print/preview functionality

Now correctly displays extras.