view client restructured
Merge pull request #534 from safiyu/newissue

view client restructured