Fixing navigation for the frontend