Fixed Client page navagation for issue #2