Changed pages to match database schema