Move some stuff to page object, soon to extract to module