move more logic to page object