Navigation changes on Clients and Storage