Changes for page object pattern

@ibabiy-okta please review