Cmspages module improvements