updated and simplified page