Refactor ClientContextView

Refactored ClientContextView