bug fixes, page picker renderers for masks module