Finish custom page refactoring