Slight tweaks so navigation basically should work with billing.