Rearranged pregen pages to work with my setup