Added pages support and the ability to override navigation with a view.