restructure pages, simplifying