Client Progress page
Fix Conflicts
Fix Conflicts
Minor Design Fixes on Tickets and client pages