Mange pages updates and related fixes

Block --> Node