FE: Add improve interaction between components. Remove straightforward dependencies.