More work on the UI and managers.