added page-functions component
fixed merge conflicts