Page Fixes for NAV