Client Presentation
Merge branch 'Client'
Cleanup