added raw, tidied up page decorator use