Finished refactoring and account verification on each page