Moved the master data to separate forms and added them within the Company form. This makes it easier when using different Roles and it keeps the main set of tabs smaller and thus more readable