Fixing navigation across pages