Rename visibility types and fix site map tags
Remove primary navigation block
Extend page nav block to allow relative tree and custom depth