lots of changes, page.php still under constre