Registration and cmspages improvements