hierarchical page nav and a lot of small fixes