Adjustments to align with new config structure. 

- I have used the UI as a basis to start doing the needed adjustments. The UI is now again working as before.
- Major integrations tests are skipped at the moment.