Moving logic into page objects