Most of the visual updates are done for Client/Contract
Minor sizing fixes
Fixed merge conflicts