pageview controller edit

and other small stuff