More work on the ui manager