added more page-types
add back navigation menu support