Work on clients section
minor admin changes
Attempt to fix merge conflict