Refactoring and adding page objects