fixed client layout navigate clean up