WIP

No Agent View rendering is borked
WIP
Merge branch 'refs/heads/marionette' into agents-app
Merge branch 'refs/heads/develop' into agents-app
Merge branch 'refs/heads/agents-app' into marionette
Improved data loading and caching