Cleaned up the client pages