fixed client layout navigate clean up
Merge pull request #53 from jstrimpel/master

fixed client layout navigate clean up