Node page refactoring