reorganized pages and layouts