Optimizing paper page
Some minor remaining issues