various fix / ui change on company/client