fix ui for company and branch form and lists